From 8ece421c6c40b0977dc2a7f91f9eff7234b814dd Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 8 Oct 2008 15:44:49 +0000
Subject: [PATCH] rebaked makefiles with 0.2.4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
Makefile.in | 30648 ++++++++--------
autoconf_inc.m4 | 280 +-
build/bakefiles/common.bkl | 27 -
build/msw/config.bcc | 2 +-
build/msw/config.gcc | 82 +-
build/msw/config.vc | 2 +-
build/msw/config.wat | 2 +-
build/msw/makefile.bcc | 32 +-
build/msw/makefile.gcc | 37 +-
build/msw/makefile.vc | 48 +-
build/msw/makefile.wat | 32 +-
build/msw/wx_base.dsp | 8 +
build/msw/wx_vc7_adv.vcproj | 802 +-
build/msw/wx_vc7_aui.vcproj | 579 +-
build/msw/wx_vc7_base.vcproj | 1295 +-
build/msw/wx_vc7_core.vcproj | 3371 +-
build/msw/wx_vc7_gl.vcproj | 548 +-
build/msw/wx_vc7_html.vcproj | 662 +-
build/msw/wx_vc7_media.vcproj | 557 +-
build/msw/wx_vc7_net.vcproj | 611 +-
build/msw/wx_vc7_propgrid.vcproj | 591 +-
build/msw/wx_vc7_qa.vcproj | 545 +-
build/msw/wx_vc7_richtext.vcproj | 594 +-
build/msw/wx_vc7_stc.vcproj | 552 +-
build/msw/wx_vc7_wxexpat.vcproj | 533 +-
build/msw/wx_vc7_wxjpeg.vcproj | 662 +-
build/msw/wx_vc7_wxpng.vcproj | 575 +-
build/msw/wx_vc7_wxregex.vcproj | 540 +-
build/msw/wx_vc7_wxscintilla.vcproj | 800 +-
build/msw/wx_vc7_wxtiff.vcproj | 632 +-
build/msw/wx_vc7_wxzlib.vcproj | 560 +-
build/msw/wx_vc7_xml.vcproj | 552 +-
build/msw/wx_vc7_xrc.vcproj | 885 +-
build/msw/wx_vc8_adv.vcproj | 402 +-
build/msw/wx_vc8_aui.vcproj | 209 +-
build/msw/wx_vc8_base.vcproj | 931 +-
build/msw/wx_vc8_core.vcproj | 2217 +-
build/msw/wx_vc8_gl.vcproj | 180 +-
build/msw/wx_vc8_html.vcproj | 294 +-
build/msw/wx_vc8_media.vcproj | 189 +-
build/msw/wx_vc8_net.vcproj | 243 +-
build/msw/wx_vc8_propgrid.vcproj | 221 +-
build/msw/wx_vc8_qa.vcproj | 177 +-
build/msw/wx_vc8_richtext.vcproj | 224 +-
build/msw/wx_vc8_stc.vcproj | 182 +-
build/msw/wx_vc8_wxexpat.vcproj | 171 +-
build/msw/wx_vc8_wxjpeg.vcproj | 300 +-
build/msw/wx_vc8_wxpng.vcproj | 213 +-
build/msw/wx_vc8_wxregex.vcproj | 176 +-
build/msw/wx_vc8_wxscintilla.vcproj | 438 +-
build/msw/wx_vc8_wxtiff.vcproj | 270 +-
build/msw/wx_vc8_wxzlib.vcproj | 198 +-
build/msw/wx_vc8_xml.vcproj | 182 +-
build/msw/wx_vc8_xrc.vcproj | 515 +-
samples/access/Makefile.in | 40 +-
samples/access/access_vc7.vcproj | 566 +-
samples/access/access_vc8.vcproj | 186 +-
samples/access/makefile.bcc | 4 +-
samples/access/makefile.gcc | 6 +-
samples/access/makefile.unx | 24 +-
samples/access/makefile.vc | 20 +-
samples/access/makefile.wat | 4 +-
samples/animate/Makefile.in | 40 +-
samples/animate/anitest_vc7.vcproj | 566 +-
samples/animate/anitest_vc8.vcproj | 186 +-
samples/animate/makefile.bcc | 4 +-
samples/animate/makefile.gcc | 6 +-
samples/animate/makefile.unx | 24 +-
samples/animate/makefile.vc | 20 +-
samples/animate/makefile.wat | 4 +-
samples/artprov/Makefile.in | 40 +-
samples/artprov/artprov_vc7.vcproj | 569 +-
samples/artprov/artprov_vc8.vcproj | 189 +-
samples/artprov/makefile.bcc | 4 +-
samples/artprov/makefile.gcc | 6 +-
samples/artprov/makefile.unx | 24 +-
samples/artprov/makefile.vc | 20 +-
samples/artprov/makefile.wat | 4 +-
samples/aui/Makefile.in | 40 +-
samples/aui/auidemo_vc7.vcproj | 566 +-
samples/aui/auidemo_vc8.vcproj | 186 +-
samples/aui/makefile.bcc | 4 +-
samples/aui/makefile.gcc | 6 +-
samples/aui/makefile.unx | 24 +-
samples/aui/makefile.vc | 20 +-
samples/aui/makefile.wat | 4 +-
samples/calendar/Makefile.in | 40 +-
samples/calendar/calendar_vc7.vcproj | 566 +-
samples/calendar/calendar_vc8.vcproj | 186 +-
samples/calendar/makefile.bcc | 4 +-
samples/calendar/makefile.gcc | 6 +-
samples/calendar/makefile.unx | 24 +-
samples/calendar/makefile.vc | 20 +-
samples/calendar/makefile.wat | 4 +-
samples/caret/Makefile.in | 40 +-
samples/caret/caret_vc7.vcproj | 566 +-
samples/caret/caret_vc8.vcproj | 186 +-
samples/caret/makefile.bcc | 4 +-
samples/caret/makefile.gcc | 6 +-
samples/caret/makefile.unx | 24 +-
samples/caret/makefile.vc | 20 +-
samples/caret/makefile.wat | 4 +-
samples/collpane/Makefile.in | 40 +-
samples/collpane/collpane_vc7.vcproj | 566 +-
samples/collpane/collpane_vc8.vcproj | 186 +-
samples/collpane/makefile.bcc | 4 +-
samples/collpane/makefile.gcc | 6 +-
samples/collpane/makefile.unx | 24 +-
samples/collpane/makefile.vc | 20 +-
samples/collpane/makefile.wat | 4 +-
samples/combo/Makefile.in | 40 +-
samples/combo/combo_vc7.vcproj | 566 +-
samples/combo/combo_vc8.vcproj | 186 +-
samples/combo/makefile.bcc | 4 +-
samples/combo/makefile.gcc | 6 +-
samples/combo/makefile.unx | 24 +-
samples/combo/makefile.vc | 20 +-
samples/combo/makefile.wat | 4 +-
samples/config/Makefile.in | 40 +-
samples/config/config_vc7.vcproj | 566 +-
samples/config/config_vc8.vcproj | 186 +-
samples/config/makefile.bcc | 4 +-
samples/config/makefile.gcc | 6 +-
samples/config/makefile.unx | 24 +-
samples/config/makefile.vc | 20 +-
samples/config/makefile.wat | 4 +-
samples/console/Makefile.in | 22 +-
samples/console/console_vc7.vcproj | 559 +-
samples/console/console_vc8.vcproj | 181 +-
samples/console/makefile.bcc | 4 +-
samples/console/makefile.gcc | 6 +-
samples/console/makefile.unx | 24 +-
samples/console/makefile.vc | 20 +-
samples/console/makefile.wat | 4 +-
samples/controls/Makefile.in | 40 +-
samples/controls/controls_vc7.vcproj | 566 +-
samples/controls/controls_vc8.vcproj | 186 +-
samples/controls/makefile.bcc | 4 +-
samples/controls/makefile.gcc | 6 +-
samples/controls/makefile.unx | 24 +-
samples/controls/makefile.vc | 20 +-
samples/controls/makefile.wat | 4 +-
samples/dataview/Makefile.in | 40 +-
samples/dataview/dataview_vc7.vcproj | 566 +-
samples/dataview/dataview_vc8.vcproj | 186 +-
samples/dataview/makefile.bcc | 4 +-
samples/dataview/makefile.gcc | 6 +-
samples/dataview/makefile.unx | 24 +-
samples/dataview/makefile.vc | 20 +-
samples/dataview/makefile.wat | 4 +-
samples/debugrpt/Makefile.in | 40 +-
samples/debugrpt/debugrpt_vc7.vcproj | 566 +-
samples/debugrpt/debugrpt_vc8.vcproj | 186 +-
samples/debugrpt/makefile.bcc | 4 +-
samples/debugrpt/makefile.gcc | 6 +-
samples/debugrpt/makefile.unx | 24 +-
samples/debugrpt/makefile.vc | 20 +-
samples/debugrpt/makefile.wat | 4 +-
samples/dialogs/Makefile.in | 40 +-
samples/dialogs/dialogs_vc7.vcproj | 614 +-
samples/dialogs/dialogs_vc8.vcproj | 186 +-
samples/dialogs/makefile.bcc | 4 +-
samples/dialogs/makefile.gcc | 6 +-
samples/dialogs/makefile.unx | 24 +-
samples/dialogs/makefile.vc | 20 +-
samples/dialogs/makefile.wat | 4 +-
samples/dialup/Makefile.in | 40 +-
samples/dialup/dialup_vc7.vcproj | 566 +-
samples/dialup/dialup_vc8.vcproj | 186 +-
samples/dialup/makefile.bcc | 4 +-
samples/dialup/makefile.gcc | 6 +-
samples/dialup/makefile.unx | 24 +-
samples/dialup/makefile.vc | 20 +-
samples/dialup/makefile.wat | 4 +-
samples/display/Makefile.in | 40 +-
samples/display/display_vc7.vcproj | 566 +-
samples/display/display_vc8.vcproj | 186 +-
samples/display/makefile.bcc | 4 +-
samples/display/makefile.gcc | 6 +-
samples/display/makefile.unx | 24 +-
samples/display/makefile.vc | 20 +-
samples/display/makefile.wat | 4 +-
samples/dnd/Makefile.in | 40 +-
samples/dnd/dnd_vc7.vcproj | 566 +-
samples/dnd/dnd_vc8.vcproj | 186 +-
samples/dnd/makefile.bcc | 4 +-
samples/dnd/makefile.gcc | 6 +-
samples/dnd/makefile.unx | 24 +-
samples/dnd/makefile.vc | 20 +-
samples/dnd/makefile.wat | 4 +-
samples/docview/Makefile.in | 40 +-
samples/docview/docview_vc7.vcproj | 37 +-
samples/docview/docview_vc8.vcproj | 192 +-
samples/docview/makefile.bcc | 4 +-
samples/docview/makefile.gcc | 6 +-
samples/docview/makefile.unx | 24 +-
samples/docview/makefile.vc | 20 +-
samples/docview/makefile.wat | 4 +-
samples/dragimag/Makefile.in | 40 +-
samples/dragimag/dragimag_vc7.vcproj | 566 +-
samples/dragimag/dragimag_vc8.vcproj | 186 +-
samples/dragimag/makefile.bcc | 4 +-
samples/dragimag/makefile.gcc | 6 +-
samples/dragimag/makefile.unx | 24 +-
samples/dragimag/makefile.vc | 20 +-
samples/dragimag/makefile.wat | 4 +-
samples/drawing/Makefile.in | 40 +-
samples/drawing/drawing_vc7.vcproj | 566 +-
samples/drawing/drawing_vc8.vcproj | 186 +-
samples/drawing/makefile.bcc | 4 +-
samples/drawing/makefile.gcc | 6 +-
samples/drawing/makefile.unx | 24 +-
samples/drawing/makefile.vc | 20 +-
samples/drawing/makefile.wat | 4 +-
samples/editlbox/Makefile.in | 40 +-
samples/editlbox/editlbox_vc7.vcproj | 566 +-
samples/editlbox/editlbox_vc8.vcproj | 186 +-
samples/editlbox/makefile.bcc | 4 +-
samples/editlbox/makefile.gcc | 6 +-
samples/editlbox/makefile.unx | 24 +-
samples/editlbox/makefile.vc | 20 +-
samples/editlbox/makefile.wat | 4 +-
samples/erase/Makefile.in | 40 +-
samples/erase/erase_vc7.vcproj | 566 +-
samples/erase/erase_vc8.vcproj | 186 +-
samples/erase/makefile.bcc | 4 +-
samples/erase/makefile.gcc | 6 +-
samples/erase/makefile.unx | 24 +-
samples/erase/makefile.vc | 20 +-
samples/erase/makefile.wat | 4 +-
samples/event/Makefile.in | 40 +-
samples/event/event_vc7.vcproj | 566 +-
samples/event/event_vc8.vcproj | 186 +-
samples/event/makefile.bcc | 4 +-
samples/event/makefile.gcc | 6 +-
samples/event/makefile.unx | 24 +-
samples/event/makefile.vc | 20 +-
samples/event/makefile.wat | 4 +-
samples/except/Makefile.in | 40 +-
samples/except/except_vc7.vcproj | 566 +-
samples/except/except_vc8.vcproj | 186 +-
samples/except/makefile.bcc | 4 +-
samples/except/makefile.gcc | 6 +-
samples/except/makefile.unx | 24 +-
samples/except/makefile.vc | 20 +-
samples/except/makefile.wat | 4 +-
samples/exec/Makefile.in | 40 +-
samples/exec/exec_vc7.vcproj | 566 +-
samples/exec/exec_vc8.vcproj | 186 +-
samples/exec/makefile.bcc | 4 +-
samples/exec/makefile.gcc | 6 +-
samples/exec/makefile.unx | 24 +-
samples/exec/makefile.vc | 20 +-
samples/exec/makefile.wat | 4 +-
samples/font/Makefile.in | 40 +-
samples/font/font_vc7.vcproj | 566 +-
samples/font/font_vc8.vcproj | 186 +-
samples/font/makefile.bcc | 4 +-
samples/font/makefile.gcc | 6 +-
samples/font/makefile.unx | 24 +-
samples/font/makefile.vc | 20 +-
samples/font/makefile.wat | 4 +-
samples/grid/Makefile.in | 40 +-
samples/grid/grid_vc7.vcproj | 566 +-
samples/grid/grid_vc8.vcproj | 186 +-
samples/grid/makefile.bcc | 4 +-
samples/grid/makefile.gcc | 6 +-
samples/grid/makefile.unx | 24 +-
samples/grid/makefile.vc | 20 +-
samples/grid/makefile.wat | 4 +-
samples/help/Makefile.in | 40 +-
samples/help/help_vc7.vcproj | 566 +-
samples/help/help_vc8.vcproj | 186 +-
samples/help/makefile.bcc | 4 +-
samples/help/makefile.gcc | 6 +-
samples/help/makefile.unx | 24 +-
samples/help/makefile.vc | 20 +-
samples/help/makefile.wat | 4 +-
samples/htlbox/Makefile.in | 40 +-
samples/htlbox/htlbox_vc7.vcproj | 566 +-
samples/htlbox/htlbox_vc8.vcproj | 186 +-
samples/htlbox/makefile.bcc | 4 +-
samples/htlbox/makefile.gcc | 6 +-
samples/htlbox/makefile.unx | 24 +-
samples/htlbox/makefile.vc | 20 +-
samples/htlbox/makefile.wat | 4 +-
samples/html/Makefile.in | 9 +-
samples/html/about/Makefile.in | 40 +-
samples/html/about/about_vc7.vcproj | 566 +-
samples/html/about/about_vc8.vcproj | 186 +-
samples/html/about/makefile.bcc | 4 +-
samples/html/about/makefile.gcc | 6 +-
samples/html/about/makefile.unx | 24 +-
samples/html/about/makefile.vc | 20 +-
samples/html/about/makefile.wat | 4 +-
samples/html/help/Makefile.in | 40 +-
samples/html/help/help_vc7.vcproj | 566 +-
samples/html/help/help_vc8.vcproj | 186 +-
samples/html/help/makefile.bcc | 4 +-
samples/html/help/makefile.gcc | 6 +-
samples/html/help/makefile.unx | 24 +-
samples/html/help/makefile.vc | 20 +-
samples/html/help/makefile.wat | 4 +-
samples/html/helpview/Makefile.in | 40 +-
samples/html/helpview/helpview_vc7.vcproj | 566 +-
samples/html/helpview/helpview_vc8.vcproj | 186 +-
samples/html/helpview/makefile.bcc | 4 +-
samples/html/helpview/makefile.gcc | 6 +-
samples/html/helpview/makefile.unx | 24 +-
samples/html/helpview/makefile.vc | 20 +-
samples/html/helpview/makefile.wat | 4 +-
samples/html/htmlctrl/Makefile.in | 40 +-
samples/html/htmlctrl/makefile.unx | 24 +-
samples/html/makefile.bcc | 7 +-
samples/html/makefile.gcc | 6 +-
samples/html/makefile.unx | 4 +-
samples/html/makefile.vc | 6 +-
samples/html/makefile.wat | 6 +-
samples/html/printing/Makefile.in | 40 +-
samples/html/printing/makefile.bcc | 4 +-
samples/html/printing/makefile.gcc | 6 +-
samples/html/printing/makefile.unx | 24 +-
samples/html/printing/makefile.vc | 20 +-
samples/html/printing/makefile.wat | 4 +-
samples/html/printing/printing_vc7.vcproj | 566 +-
samples/html/printing/printing_vc8.vcproj | 186 +-
samples/html/test/Makefile.in | 40 +-
samples/html/test/makefile.bcc | 4 +-
samples/html/test/makefile.gcc | 6 +-
samples/html/test/makefile.unx | 24 +-
samples/html/test/makefile.vc | 20 +-
samples/html/test/makefile.wat | 4 +-
samples/html/test/test_vc7.vcproj | 566 +-
samples/html/test/test_vc8.vcproj | 186 +-
samples/html/virtual/Makefile.in | 40 +-
samples/html/virtual/makefile.bcc | 4 +-
samples/html/virtual/makefile.gcc | 6 +-
samples/html/virtual/makefile.unx | 24 +-
samples/html/virtual/makefile.vc | 20 +-
samples/html/virtual/makefile.wat | 4 +-
samples/html/virtual/virtual_vc7.vcproj | 566 +-
samples/html/virtual/virtual_vc8.vcproj | 186 +-
samples/html/widget/Makefile.in | 40 +-
samples/html/widget/makefile.bcc | 4 +-
samples/html/widget/makefile.gcc | 6 +-
samples/html/widget/makefile.unx | 24 +-
samples/html/widget/makefile.vc | 20 +-
samples/html/widget/makefile.wat | 4 +-
samples/html/widget/widget_vc7.vcproj | 566 +-
samples/html/widget/widget_vc8.vcproj | 186 +-
samples/html/zip/Makefile.in | 40 +-
samples/html/zip/makefile.bcc | 4 +-
samples/html/zip/makefile.gcc | 6 +-
samples/html/zip/makefile.unx | 24 +-
samples/html/zip/makefile.vc | 20 +-
samples/html/zip/makefile.wat | 4 +-
samples/html/zip/zip_vc7.vcproj | 566 +-
samples/html/zip/zip_vc8.vcproj | 186 +-
samples/image/Makefile.in | 40 +-
samples/image/image_vc7.vcproj | 566 +-
samples/image/image_vc8.vcproj | 186 +-
samples/image/makefile.bcc | 4 +-
samples/image/makefile.gcc | 6 +-
samples/image/makefile.unx | 24 +-
samples/image/makefile.vc | 20 +-
samples/image/makefile.wat | 4 +-
samples/internat/Makefile.in | 43 +-
samples/internat/internat_vc7.vcproj | 566 +-
samples/internat/internat_vc8.vcproj | 186 +-
samples/internat/makefile.bcc | 4 +-
samples/internat/makefile.gcc | 6 +-
samples/internat/makefile.unx | 24 +-
samples/internat/makefile.vc | 20 +-
samples/internat/makefile.wat | 4 +-
samples/ipc/Makefile.in | 46 +-
samples/ipc/ipc_vc7_baseipcclient.vcproj | 559 +-
samples/ipc/ipc_vc7_baseipcserver.vcproj | 559 +-
samples/ipc/ipc_vc7_ipcclient.vcproj | 566 +-
samples/ipc/ipc_vc7_ipcserver.vcproj | 566 +-
samples/ipc/ipc_vc8_baseipcclient.vcproj | 181 +-
samples/ipc/ipc_vc8_baseipcserver.vcproj | 181 +-
samples/ipc/ipc_vc8_ipcclient.vcproj | 186 +-
samples/ipc/ipc_vc8_ipcserver.vcproj | 186 +-
samples/ipc/makefile.bcc | 10 +-
samples/ipc/makefile.gcc | 12 +-
samples/ipc/makefile.unx | 24 +-
samples/ipc/makefile.vc | 26 +-
samples/ipc/makefile.wat | 10 +-
samples/joytest/Makefile.in | 40 +-
samples/joytest/joytest_vc7.vcproj | 566 +-
samples/joytest/joytest_vc8.vcproj | 186 +-
samples/joytest/makefile.bcc | 4 +-
samples/joytest/makefile.gcc | 6 +-
samples/joytest/makefile.unx | 24 +-
samples/joytest/makefile.vc | 20 +-
samples/joytest/makefile.wat | 4 +-
samples/keyboard/Makefile.in | 40 +-
samples/keyboard/keyboard_vc7.vcproj | 566 +-
samples/keyboard/keyboard_vc8.vcproj | 186 +-
samples/keyboard/makefile.bcc | 4 +-
samples/keyboard/makefile.gcc | 6 +-
samples/keyboard/makefile.unx | 24 +-
samples/keyboard/makefile.vc | 20 +-
samples/keyboard/makefile.wat | 4 +-
samples/layout/Makefile.in | 40 +-
samples/layout/layout_vc7.vcproj | 566 +-
samples/layout/layout_vc8.vcproj | 186 +-
samples/layout/makefile.bcc | 4 +-
samples/layout/makefile.gcc | 6 +-
samples/layout/makefile.unx | 24 +-
samples/layout/makefile.vc | 20 +-
samples/layout/makefile.wat | 4 +-
samples/listctrl/Makefile.in | 40 +-
samples/listctrl/listctrl_vc7.vcproj | 566 +-
samples/listctrl/listctrl_vc8.vcproj | 186 +-
samples/listctrl/makefile.bcc | 4 +-
samples/listctrl/makefile.gcc | 6 +-
samples/listctrl/makefile.unx | 24 +-
samples/listctrl/makefile.vc | 20 +-
samples/listctrl/makefile.wat | 4 +-
samples/makefile.bcc | 2 +-
samples/makefile.gcc | 11 +-
samples/makefile.vc | 2 +-
samples/makefile.wat | 2 +-
samples/mdi/Makefile.in | 40 +-
samples/mdi/makefile.bcc | 4 +-
samples/mdi/makefile.gcc | 6 +-
samples/mdi/makefile.unx | 24 +-
samples/mdi/makefile.vc | 20 +-
samples/mdi/makefile.wat | 4 +-
samples/mdi/mdi_vc7.vcproj | 566 +-
samples/mdi/mdi_vc8.vcproj | 186 +-
samples/mediaplayer/Makefile.in | 40 +-
samples/mediaplayer/makefile.bcc | 4 +-
samples/mediaplayer/makefile.gcc | 6 +-
samples/mediaplayer/makefile.unx | 24 +-
samples/mediaplayer/makefile.vc | 20 +-
samples/mediaplayer/makefile.wat | 4 +-
samples/mediaplayer/mediaplayer_vc7.vcproj | 566 +-
samples/mediaplayer/mediaplayer_vc8.vcproj | 186 +-
samples/memcheck/Makefile.in | 40 +-
samples/memcheck/makefile.bcc | 4 +-
samples/memcheck/makefile.gcc | 6 +-
samples/memcheck/makefile.unx | 24 +-
samples/memcheck/makefile.vc | 20 +-
samples/memcheck/makefile.wat | 4 +-
samples/memcheck/memcheck_vc7.vcproj | 566 +-
samples/memcheck/memcheck_vc8.vcproj | 186 +-
samples/menu/Makefile.in | 40 +-
samples/menu/makefile.bcc | 4 +-
samples/menu/makefile.gcc | 6 +-
samples/menu/makefile.unx | 24 +-
samples/menu/makefile.vc | 20 +-
samples/menu/makefile.wat | 4 +-
samples/menu/menu_vc7.vcproj | 566 +-
samples/menu/menu_vc8.vcproj | 186 +-
samples/mfc/Makefile.in | 40 +-
samples/mfc/makefile.bcc | 4 +-
samples/mfc/makefile.gcc | 6 +-
samples/mfc/makefile.unx | 24 +-
samples/mfc/makefile.vc | 20 +-
samples/mfc/makefile.wat | 4 +-
samples/mfc/mfc_vc7.vcproj | 566 +-
samples/mfc/mfc_vc8.vcproj | 186 +-
samples/minimal/Makefile.in | 40 +-
samples/minimal/makefile.bcc | 4 +-
samples/minimal/makefile.gcc | 6 +-
samples/minimal/makefile.unx | 24 +-
samples/minimal/makefile.vc | 20 +-
samples/minimal/makefile.wat | 4 +-
samples/minimal/minimal_vc7.vcproj | 566 +-
samples/minimal/minimal_vc8.vcproj | 186 +-
samples/mobile/Makefile.in | 6 +-
samples/mobile/makefile.bcc | 7 +-
samples/mobile/makefile.gcc | 6 +-
samples/mobile/makefile.unx | 4 +-
samples/mobile/makefile.vc | 6 +-
samples/mobile/makefile.wat | 6 +-
samples/mobile/styles/Makefile.in | 40 +-
samples/mobile/styles/makefile.bcc | 4 +-
samples/mobile/styles/makefile.gcc | 6 +-
samples/mobile/styles/makefile.unx | 24 +-
samples/mobile/styles/makefile.vc | 20 +-
samples/mobile/styles/makefile.wat | 4 +-
samples/mobile/styles/styles_vc7.vcproj | 566 +-
samples/mobile/styles/styles_vc8.vcproj | 186 +-
samples/mobile/wxedit/Makefile.in | 40 +-
samples/mobile/wxedit/makefile.bcc | 4 +-
samples/mobile/wxedit/makefile.gcc | 6 +-
samples/mobile/wxedit/makefile.unx | 24 +-
samples/mobile/wxedit/makefile.vc | 20 +-
samples/mobile/wxedit/makefile.wat | 4 +-
samples/mobile/wxedit/wxedit_vc7.vcproj | 566 +-
samples/mobile/wxedit/wxedit_vc8.vcproj | 186 +-
samples/nativdlg/Makefile.in | 40 +-
samples/nativdlg/makefile.bcc | 4 +-
samples/nativdlg/makefile.gcc | 6 +-
samples/nativdlg/makefile.unx | 24 +-
samples/nativdlg/makefile.vc | 20 +-
samples/nativdlg/makefile.wat | 4 +-
samples/nativdlg/nativdlg_vc7.vcproj | 566 +-
samples/nativdlg/nativdlg_vc8.vcproj | 186 +-
samples/notebook/Makefile.in | 40 +-
samples/notebook/makefile.bcc | 4 +-
samples/notebook/makefile.gcc | 6 +-
samples/notebook/makefile.unx | 24 +-
samples/notebook/makefile.vc | 20 +-
samples/notebook/makefile.wat | 4 +-
samples/notebook/notebook_vc7.vcproj | 566 +-
samples/notebook/notebook_vc8.vcproj | 186 +-
samples/oleauto/Makefile.in | 40 +-
samples/oleauto/makefile.bcc | 4 +-
samples/oleauto/makefile.gcc | 6 +-
samples/oleauto/makefile.unx | 24 +-
samples/oleauto/makefile.vc | 20 +-
samples/oleauto/makefile.wat | 4 +-
samples/oleauto/oleauto_vc7.vcproj | 566 +-
samples/oleauto/oleauto_vc8.vcproj | 186 +-
samples/opengl/Makefile.in | 6 +-
samples/opengl/cube/Makefile.in | 40 +-
samples/opengl/cube/cube_vc7.vcproj | 566 +-
samples/opengl/cube/cube_vc8.vcproj | 186 +-
samples/opengl/cube/makefile.bcc | 4 +-
samples/opengl/cube/makefile.gcc | 6 +-
samples/opengl/cube/makefile.unx | 24 +-
samples/opengl/cube/makefile.vc | 20 +-
samples/opengl/cube/makefile.wat | 4 +-
samples/opengl/isosurf/Makefile.in | 40 +-
samples/opengl/isosurf/isosurf_vc7.vcproj | 566 +-
samples/opengl/isosurf/isosurf_vc8.vcproj | 186 +-
samples/opengl/isosurf/makefile.bcc | 4 +-
samples/opengl/isosurf/makefile.gcc | 6 +-
samples/opengl/isosurf/makefile.unx | 24 +-
samples/opengl/isosurf/makefile.vc | 20 +-
samples/opengl/isosurf/makefile.wat | 4 +-
samples/opengl/makefile.bcc | 7 +-
samples/opengl/makefile.gcc | 6 +-
samples/opengl/makefile.unx | 4 +-
samples/opengl/makefile.vc | 6 +-
samples/opengl/makefile.wat | 6 +-
samples/opengl/penguin/Makefile.in | 40 +-
samples/opengl/penguin/makefile.bcc | 4 +-
samples/opengl/penguin/makefile.gcc | 6 +-
samples/opengl/penguin/makefile.unx | 28 +-
samples/opengl/penguin/makefile.vc | 20 +-
samples/opengl/penguin/makefile.wat | 4 +-
samples/opengl/penguin/penguin_vc7.vcproj | 572 +-
samples/opengl/penguin/penguin_vc8.vcproj | 192 +-
samples/ownerdrw/Makefile.in | 40 +-
samples/ownerdrw/makefile.bcc | 4 +-
samples/ownerdrw/makefile.gcc | 6 +-
samples/ownerdrw/makefile.unx | 24 +-
samples/ownerdrw/makefile.vc | 20 +-
samples/ownerdrw/makefile.wat | 4 +-
samples/ownerdrw/ownerdrw_vc7.vcproj | 566 +-
samples/ownerdrw/ownerdrw_vc8.vcproj | 186 +-
samples/popup/Makefile.in | 40 +-
samples/popup/makefile.bcc | 4 +-
samples/popup/makefile.gcc | 6 +-
samples/popup/makefile.unx | 24 +-
samples/popup/makefile.vc | 20 +-
samples/popup/makefile.wat | 4 +-
samples/popup/popup_vc7.vcproj | 566 +-
samples/popup/popup_vc8.vcproj | 186 +-
samples/power/Makefile.in | 40 +-
samples/power/makefile.bcc | 4 +-
samples/power/makefile.gcc | 6 +-
samples/power/makefile.unx | 24 +-
samples/power/makefile.vc | 20 +-
samples/power/makefile.wat | 4 +-
samples/power/power_vc7.vcproj | 566 +-
samples/power/power_vc8.vcproj | 186 +-
samples/printing/Makefile.in | 40 +-
samples/printing/makefile.bcc | 4 +-
samples/printing/makefile.gcc | 6 +-
samples/printing/makefile.unx | 24 +-
samples/printing/makefile.vc | 20 +-
samples/printing/makefile.wat | 4 +-
samples/printing/printing_vc7.vcproj | 566 +-
samples/printing/printing_vc8.vcproj | 186 +-
samples/propgrid/Makefile.in | 40 +-
samples/propgrid/makefile.bcc | 4 +-
samples/propgrid/makefile.gcc | 6 +-
samples/propgrid/makefile.unx | 28 +-
samples/propgrid/makefile.vc | 20 +-
samples/propgrid/makefile.wat | 4 +-
samples/propgrid/propgrid_vc7.vcproj | 575 +-
samples/propgrid/propgrid_vc8.vcproj | 195 +-
samples/regtest/Makefile.in | 40 +-
samples/regtest/makefile.bcc | 4 +-
samples/regtest/makefile.gcc | 6 +-
samples/regtest/makefile.unx | 24 +-
samples/regtest/makefile.vc | 20 +-
samples/regtest/makefile.wat | 4 +-
samples/regtest/regtest_vc7.vcproj | 566 +-
samples/regtest/regtest_vc8.vcproj | 186 +-
samples/render/Makefile.in | 55 +-
samples/render/makefile.bcc | 6 +-
samples/render/makefile.gcc | 8 +-
samples/render/makefile.unx | 28 +-
samples/render/makefile.vc | 22 +-
samples/render/makefile.wat | 6 +-
samples/render/render_vc7_renddll.vcproj | 285 +-
samples/render/render_vc7_render.vcproj | 566 +-
samples/render/render_vc8_renddll.vcproj | 87 +-
samples/render/render_vc8_render.vcproj | 186 +-
samples/richtext/Makefile.in | 40 +-
samples/richtext/makefile.bcc | 4 +-
samples/richtext/makefile.gcc | 6 +-
samples/richtext/makefile.unx | 24 +-
samples/richtext/makefile.vc | 20 +-
samples/richtext/makefile.wat | 4 +-
samples/richtext/richtext_vc7.vcproj | 566 +-
samples/richtext/richtext_vc8.vcproj | 186 +-
samples/sashtest/Makefile.in | 40 +-
samples/sashtest/makefile.bcc | 4 +-
samples/sashtest/makefile.gcc | 6 +-
samples/sashtest/makefile.unx | 24 +-
samples/sashtest/makefile.vc | 20 +-
samples/sashtest/makefile.wat | 4 +-
samples/sashtest/sashtest_vc7.vcproj | 566 +-
samples/sashtest/sashtest_vc8.vcproj | 186 +-
samples/scroll/Makefile.in | 40 +-
samples/scroll/makefile.bcc | 4 +-
samples/scroll/makefile.gcc | 6 +-
samples/scroll/makefile.unx | 24 +-
samples/scroll/makefile.vc | 20 +-
samples/scroll/makefile.wat | 4 +-
samples/scroll/scroll_vc7.vcproj | 566 +-
samples/scroll/scroll_vc8.vcproj | 186 +-
samples/scrollsub/Makefile.in | 40 +-
samples/scrollsub/makefile.bcc | 4 +-
samples/scrollsub/makefile.gcc | 6 +-
samples/scrollsub/makefile.unx | 24 +-
samples/scrollsub/makefile.vc | 20 +-
samples/scrollsub/makefile.wat | 4 +-
samples/scrollsub/scrollsub_vc7.vcproj | 566 +-
samples/scrollsub/scrollsub_vc8.vcproj | 186 +-
samples/shaped/Makefile.in | 40 +-
samples/shaped/makefile.bcc | 4 +-
samples/shaped/makefile.gcc | 6 +-
samples/shaped/makefile.unx | 24 +-
samples/shaped/makefile.vc | 20 +-
samples/shaped/makefile.wat | 4 +-
samples/shaped/shaped_vc7.vcproj | 566 +-
samples/shaped/shaped_vc8.vcproj | 186 +-
samples/sockets/Makefile.in | 46 +-
samples/sockets/makefile.bcc | 10 +-
samples/sockets/makefile.gcc | 12 +-
samples/sockets/makefile.unx | 24 +-
samples/sockets/makefile.vc | 26 +-
samples/sockets/makefile.wat | 10 +-
samples/sockets/sockets_vc7_baseclient.vcproj | 559 +-
samples/sockets/sockets_vc7_baseserver.vcproj | 559 +-
samples/sockets/sockets_vc7_client.vcproj | 566 +-
samples/sockets/sockets_vc7_server.vcproj | 566 +-
samples/sockets/sockets_vc8_baseclient.vcproj | 181 +-
samples/sockets/sockets_vc8_baseserver.vcproj | 181 +-
samples/sockets/sockets_vc8_client.vcproj | 186 +-
samples/sockets/sockets_vc8_server.vcproj | 186 +-
samples/sound/Makefile.in | 40 +-
samples/sound/makefile.bcc | 4 +-
samples/sound/makefile.gcc | 6 +-
samples/sound/makefile.unx | 24 +-
samples/sound/makefile.vc | 20 +-
samples/sound/makefile.wat | 4 +-
samples/sound/sound_vc7.vcproj | 566 +-
samples/sound/sound_vc8.vcproj | 186 +-
samples/splash/Makefile.in | 40 +-
samples/splash/makefile.bcc | 4 +-
samples/splash/makefile.gcc | 6 +-
samples/splash/makefile.unx | 24 +-
samples/splash/makefile.vc | 20 +-
samples/splash/makefile.wat | 4 +-
samples/splash/splash_vc7.vcproj | 566 +-
samples/splash/splash_vc8.vcproj | 186 +-
samples/splitter/Makefile.in | 40 +-
samples/splitter/makefile.bcc | 4 +-
samples/splitter/makefile.gcc | 6 +-
samples/splitter/makefile.unx | 24 +-
samples/splitter/makefile.vc | 20 +-
samples/splitter/makefile.wat | 4 +-
samples/splitter/splitter_vc7.vcproj | 566 +-
samples/splitter/splitter_vc8.vcproj | 186 +-
samples/statbar/Makefile.in | 40 +-
samples/statbar/makefile.bcc | 4 +-
samples/statbar/makefile.gcc | 6 +-
samples/statbar/makefile.unx | 24 +-
samples/statbar/makefile.vc | 20 +-
samples/statbar/makefile.wat | 4 +-
samples/statbar/statbar_vc7.vcproj | 566 +-
samples/statbar/statbar_vc8.vcproj | 186 +-
samples/stc/Makefile.in | 40 +-
samples/stc/makefile.bcc | 4 +-
samples/stc/makefile.gcc | 6 +-
samples/stc/makefile.unx | 24 +-
samples/stc/makefile.vc | 20 +-
samples/stc/makefile.wat | 4 +-
samples/stc/stctest_vc7.vcproj | 572 +-
samples/stc/stctest_vc8.vcproj | 192 +-
samples/svg/Makefile.in | 40 +-
samples/svg/makefile.bcc | 4 +-
samples/svg/makefile.gcc | 6 +-
samples/svg/makefile.unx | 24 +-
samples/svg/makefile.vc | 20 +-
samples/svg/makefile.wat | 4 +-
samples/svg/svgtest_vc7.vcproj | 566 +-
samples/svg/svgtest_vc8.vcproj | 186 +-
samples/taborder/Makefile.in | 40 +-
samples/taborder/makefile.bcc | 4 +-
samples/taborder/makefile.gcc | 6 +-
samples/taborder/makefile.unx | 24 +-
samples/taborder/makefile.vc | 20 +-
samples/taborder/makefile.wat | 4 +-
samples/taborder/taborder_vc7.vcproj | 566 +-
samples/taborder/taborder_vc8.vcproj | 186 +-
samples/taskbar/Makefile.in | 40 +-
samples/taskbar/makefile.bcc | 4 +-
samples/taskbar/makefile.gcc | 6 +-
samples/taskbar/makefile.unx | 24 +-
samples/taskbar/makefile.vc | 20 +-
samples/taskbar/makefile.wat | 4 +-
samples/taskbar/taskbar_vc7.vcproj | 566 +-
samples/taskbar/taskbar_vc8.vcproj | 186 +-
samples/text/Makefile.in | 40 +-
samples/text/makefile.bcc | 4 +-
samples/text/makefile.gcc | 6 +-
samples/text/makefile.unx | 24 +-
samples/text/makefile.vc | 20 +-
samples/text/makefile.wat | 4 +-
samples/text/text_vc7.vcproj | 566 +-
samples/text/text_vc8.vcproj | 186 +-
samples/thread/Makefile.in | 40 +-
samples/thread/makefile.bcc | 4 +-
samples/thread/makefile.gcc | 6 +-
samples/thread/makefile.unx | 24 +-
samples/thread/makefile.vc | 20 +-
samples/thread/makefile.wat | 4 +-
samples/thread/thread_vc7.vcproj | 566 +-
samples/thread/thread_vc8.vcproj | 186 +-
samples/toolbar/Makefile.in | 40 +-
samples/toolbar/makefile.bcc | 4 +-
samples/toolbar/makefile.gcc | 6 +-
samples/toolbar/makefile.unx | 24 +-
samples/toolbar/makefile.vc | 20 +-
samples/toolbar/makefile.wat | 4 +-
samples/toolbar/toolbar_vc7.vcproj | 566 +-
samples/toolbar/toolbar_vc8.vcproj | 186 +-
samples/treectrl/Makefile.in | 40 +-
samples/treectrl/makefile.bcc | 4 +-
samples/treectrl/makefile.gcc | 6 +-
samples/treectrl/makefile.unx | 24 +-
samples/treectrl/makefile.vc | 20 +-
samples/treectrl/makefile.wat | 4 +-
samples/treectrl/treectrl_vc7.vcproj | 566 +-
samples/treectrl/treectrl_vc8.vcproj | 186 +-
samples/typetest/Makefile.in | 40 +-
samples/typetest/makefile.bcc | 4 +-
samples/typetest/makefile.gcc | 6 +-
samples/typetest/makefile.unx | 24 +-
samples/typetest/makefile.vc | 20 +-
samples/typetest/makefile.wat | 4 +-
samples/typetest/typetest_vc7.vcproj | 566 +-
samples/typetest/typetest_vc8.vcproj | 186 +-
samples/validate/Makefile.in | 40 +-
samples/validate/makefile.bcc | 4 +-
samples/validate/makefile.gcc | 6 +-
samples/validate/makefile.unx | 24 +-
samples/validate/makefile.vc | 20 +-
samples/validate/makefile.wat | 4 +-
samples/validate/validate_vc7.vcproj | 566 +-
samples/validate/validate_vc8.vcproj | 186 +-
samples/vscroll/Makefile.in | 40 +-
samples/vscroll/makefile.bcc | 4 +-
samples/vscroll/makefile.gcc | 6 +-
samples/vscroll/makefile.unx | 24 +-
samples/vscroll/makefile.vc | 20 +-
samples/vscroll/makefile.wat | 4 +-
samples/vscroll/vscroll_vc7.vcproj | 566 +-
samples/vscroll/vscroll_vc8.vcproj | 186 +-
samples/widgets/Makefile.in | 40 +-
samples/widgets/makefile.bcc | 4 +-
samples/widgets/makefile.gcc | 6 +-
samples/widgets/makefile.unx | 24 +-
samples/widgets/makefile.vc | 20 +-
samples/widgets/makefile.wat | 4 +-
samples/widgets/widgets_vc7.vcproj | 644 +-
samples/widgets/widgets_vc8.vcproj | 264 +-
samples/wizard/Makefile.in | 40 +-
samples/wizard/makefile.bcc | 4 +-
samples/wizard/makefile.gcc | 6 +-
samples/wizard/makefile.unx | 24 +-
samples/wizard/makefile.vc | 20 +-
samples/wizard/makefile.wat | 4 +-
samples/wizard/wizard_vc7.vcproj | 566 +-
samples/wizard/wizard_vc8.vcproj | 186 +-
samples/wrapsizer/Makefile.in | 40 +-
samples/wrapsizer/makefile.bcc | 4 +-
samples/wrapsizer/makefile.gcc | 6 +-
samples/wrapsizer/makefile.unx | 24 +-
samples/wrapsizer/makefile.vc | 20 +-
samples/wrapsizer/makefile.wat | 4 +-
samples/wrapsizer/wrapsizer_vc7.vcproj | 566 +-
samples/wrapsizer/wrapsizer_vc8.vcproj | 186 +-
samples/xrc/Makefile.in | 40 +-
samples/xrc/makefile.bcc | 4 +-
samples/xrc/makefile.gcc | 6 +-
samples/xrc/makefile.unx | 24 +-
samples/xrc/makefile.vc | 20 +-
samples/xrc/makefile.wat | 4 +-
samples/xrc/xrcdemo_vc7.vcproj | 575 +-
samples/xrc/xrcdemo_vc8.vcproj | 195 +-
tests/Makefile.in | 87 +-
tests/benchmarks/Makefile.in | 22 +-
tests/benchmarks/bench.vcproj | 571 +-
tests/benchmarks/makefile.bcc | 4 +-
tests/benchmarks/makefile.gcc | 6 +-
tests/benchmarks/makefile.vc | 20 +-
tests/benchmarks/makefile.wat | 4 +-
tests/makefile.bcc | 8 +-
tests/makefile.gcc | 10 +-
tests/makefile.vc | 24 +-
tests/makefile.wat | 8 +-
tests/test_vc7_printfbench.vcproj | 559 +-
tests/test_vc7_test.vcproj | 727 +-
tests/test_vc7_test_gui.vcproj | 602 +-
tests/test_vc8_printfbench.vcproj | 197 +-
tests/test_vc8_test.vcproj | 365 +-
tests/test_vc8_test_gui.vcproj | 238 +-
wxGTK.spec | 2 +
wxMotif.spec | 2 +
wxX11.spec | 2 +
832 files changed, 66622 insertions(+), 73754 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index b76f485e08..978fd9b206 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -45,6 +45,7 @@ CC = @CC@
CXX = @CXX@
CFLAGS = @CFLAGS@
CXXFLAGS = @CXXFLAGS@
+OBJCXXFLAGS = @OBJCXXFLAGS@
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
VENDOR = @VENDOR@
@@ -834,6 +835,14 @@ MONODLL_CXXFLAGS = $(__monodll_PCH_INC) -D__WX$(TOOLKIT)__ \
-I$(top_srcdir)/src/stc/scintilla/include \
-I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
$(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+MONODLL_OBJCXXFLAGS = $(__monodll_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
+ $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+ $(__INC_EXPAT_p) -DwxUSE_BASE=1 -DWXMAKINGDLL \
+ -I$(top_srcdir)/src/stc/scintilla/include \
+ -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
+ $(PIC_FLAG) $(CPPFLAGS) $(OBJCXXFLAGS)
MONODLL_OBJECTS = \
monodll_appbase.o \
monodll_arcall.o \
@@ -935,7 +944,7 @@ MONODLL_OBJECTS = \
monodll_xtixml.o \
$(__PLUGIN_ADV_SRC_OBJECTS) \
$(__monodll___win32rc)
-MONODLL_ODEP = $(___pch_wxprec_monodll_wx_wxprec_h_gch___depname)
+MONODLL_ODEP = $(_____pch_wxprec_monodll_wx_wxprec_h_gch___depname)
MONOLIB_CFLAGS = $(__monolib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
@@ -950,6 +959,13 @@ MONOLIB_CXXFLAGS = $(__monolib_PCH_INC) -D__WX$(TOOLKIT)__ \
$(__INC_EXPAT_p) -DwxUSE_BASE=1 -I$(top_srcdir)/src/stc/scintilla/include \
-I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+MONOLIB_OBJCXXFLAGS = $(__monolib_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
+ $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+ $(__INC_EXPAT_p) -DwxUSE_BASE=1 -I$(top_srcdir)/src/stc/scintilla/include \
+ -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
+ $(CPPFLAGS) $(OBJCXXFLAGS)
MONOLIB_OBJECTS = \
monolib_appbase.o \
monolib_arcall.o \
@@ -1050,7 +1066,7 @@ MONOLIB_OBJECTS = \
monolib_xml.o \
monolib_xtixml.o \
$(__PLUGIN_ADV_SRC_OBJECTS_1)
-MONOLIB_ODEP = $(___pch_wxprec_monolib_wx_wxprec_h_gch___depname)
+MONOLIB_ODEP = $(_____pch_wxprec_monolib_wx_wxprec_h_gch___depname)
BASEDLL_CFLAGS = $(__basedll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
@@ -1063,6 +1079,12 @@ BASEDLL_CXXFLAGS = $(__basedll_PCH_INC) -D__WX$(TOOLKIT)__ \
$(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
$(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 $(PIC_FLAG) \
$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+BASEDLL_OBJCXXFLAGS = $(__basedll_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
+ $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+ $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 $(PIC_FLAG) \
+ $(CPPFLAGS) $(OBJCXXFLAGS)
BASEDLL_OBJECTS = \
$(__basedll___win32rc) \
basedll_appbase.o \
@@ -1149,7 +1171,7 @@ BASEDLL_OBJECTS = \
basedll_utilscmn.o \
$(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2) \
$(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_2)
-BASEDLL_ODEP = $(___pch_wxprec_basedll_wx_wxprec_h_gch___depname)
+BASEDLL_ODEP = $(_____pch_wxprec_basedll_wx_wxprec_h_gch___depname)
BASELIB_CFLAGS = $(__baselib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
@@ -1161,6 +1183,11 @@ BASELIB_CXXFLAGS = $(__baselib_PCH_INC) -D__WX$(TOOLKIT)__ \
$(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
$(__INC_EXPAT_p) -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CXXWARNINGS) $(CPPFLAGS) \
$(CXXFLAGS)
+BASELIB_OBJCXXFLAGS = $(__baselib_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
+ $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+ $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CPPFLAGS) $(OBJCXXFLAGS)
BASELIB_OBJECTS = \
baselib_appbase.o \
baselib_arcall.o \
@@ -1246,7 +1273,7 @@ BASELIB_OBJECTS = \
baselib_utilscmn.o \
$(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3) \
$(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3)
-BASELIB_ODEP = $(___pch_wxprec_baselib_wx_wxprec_h_gch___depname)
+BASELIB_ODEP = $(_____pch_wxprec_baselib_wx_wxprec_h_gch___depname)
NETDLL_CXXFLAGS = $(__netdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
@@ -1266,7 +1293,7 @@ NETDLL_OBJECTS = \
netdll_socket.o \
netdll_url.o \
$(__NET_PLATFORM_SRC_OBJECTS_2)
-NETDLL_ODEP = $(___pch_wxprec_netdll_wx_wxprec_h_gch___depname)
+NETDLL_ODEP = $(_____pch_wxprec_netdll_wx_wxprec_h_gch___depname)
NETLIB_CXXFLAGS = $(__netlib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
@@ -1284,7 +1311,7 @@ NETLIB_OBJECTS = \
netlib_socket.o \
netlib_url.o \
$(__NET_PLATFORM_SRC_OBJECTS_3)
-NETLIB_ODEP = $(___pch_wxprec_netlib_wx_wxprec_h_gch___depname)
+NETLIB_ODEP = $(_____pch_wxprec_netlib_wx_wxprec_h_gch___depname)
COREDLL_CFLAGS = $(__coredll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
@@ -1297,6 +1324,12 @@ COREDLL_CXXFLAGS = $(__coredll_PCH_INC) -D__WX$(TOOLKIT)__ \
$(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
$(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 $(PIC_FLAG) \
$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+COREDLL_OBJCXXFLAGS = $(__coredll_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
+ $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+ $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 $(PIC_FLAG) \
+ $(CPPFLAGS) $(OBJCXXFLAGS)
COREDLL_OBJECTS = \
$(__coredll___win32rc) \
coredll_event.o \
@@ -1306,7 +1339,7 @@ COREDLL_OBJECTS = \
$(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4) \
$(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_4) \
$(__CORE_SRC_OBJECTS_2)
-COREDLL_ODEP = $(___pch_wxprec_coredll_wx_wxprec_h_gch___depname)
+COREDLL_ODEP = $(_____pch_wxprec_coredll_wx_wxprec_h_gch___depname)
CORELIB_CFLAGS = $(__corelib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
@@ -1317,6 +1350,11 @@ CORELIB_CXXFLAGS = $(__corelib_PCH_INC) -D__WX$(TOOLKIT)__ \
$(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
$(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
$(__INC_EXPAT_p) -DwxUSE_BASE=0 $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+CORELIB_OBJCXXFLAGS = $(__corelib_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
+ $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+ $(__INC_EXPAT_p) -DwxUSE_BASE=0 $(CPPFLAGS) $(OBJCXXFLAGS)
CORELIB_OBJECTS = \
corelib_event.o \
corelib_fs_mem.o \
@@ -1325,7 +1363,7 @@ CORELIB_OBJECTS = \
$(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5) \
$(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_5) \
$(__CORE_SRC_OBJECTS_3)
-CORELIB_ODEP = $(___pch_wxprec_corelib_wx_wxprec_h_gch___depname)
+CORELIB_ODEP = $(_____pch_wxprec_corelib_wx_wxprec_h_gch___depname)
ADVDLL_CFLAGS = $(__advdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
@@ -1337,11 +1375,17 @@ ADVDLL_CXXFLAGS = $(__advdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-DWXUSINGDLL -DWXMAKINGDLL_ADV $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) \
$(CXXFLAGS)
+ADVDLL_OBJCXXFLAGS = $(__advdll_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
+ $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+ $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_ADV $(PIC_FLAG) $(CPPFLAGS) \
+ $(OBJCXXFLAGS)
ADVDLL_OBJECTS = \
$(__advdll___win32rc) \
$(__ADVANCED_SRC_OBJECTS_2) \
$(__PLUGIN_ADV_SRC_OBJECTS_2)
-ADVDLL_ODEP = $(___pch_wxprec_advdll_wx_wxprec_h_gch___depname)
+ADVDLL_ODEP = $(_____pch_wxprec_advdll_wx_wxprec_h_gch___depname)
ADVLIB_CFLAGS = $(__advlib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
@@ -1352,30 +1396,46 @@ ADVLIB_CXXFLAGS = $(__advlib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
$(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+ADVLIB_OBJCXXFLAGS = $(__advlib_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
+ $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+ $(__INC_EXPAT_p) $(CPPFLAGS) $(OBJCXXFLAGS)
ADVLIB_OBJECTS = \
$(__ADVANCED_SRC_OBJECTS_3) \
$(__PLUGIN_ADV_SRC_OBJECTS_3)
-ADVLIB_ODEP = $(___pch_wxprec_advlib_wx_wxprec_h_gch___depname)
+ADVLIB_ODEP = $(_____pch_wxprec_advlib_wx_wxprec_h_gch___depname)
MEDIADLL_CXXFLAGS = $(__mediadll_PCH_INC) -D__WX$(TOOLKIT)__ \
$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
$(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
$(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_MEDIA $(PIC_FLAG) $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
+MEDIADLL_OBJCXXFLAGS = $(__mediadll_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
+ $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+ $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_MEDIA $(PIC_FLAG) $(CPPFLAGS) \
+ $(OBJCXXFLAGS)
MEDIADLL_OBJECTS = \
$(__mediadll___win32rc) \
mediadll_mediactrlcmn.o \
$(__MEDIA_PLATFORM_SRC_OBJECTS_2)
-MEDIADLL_ODEP = $(___pch_wxprec_mediadll_wx_wxprec_h_gch___depname)
+MEDIADLL_ODEP = $(_____pch_wxprec_mediadll_wx_wxprec_h_gch___depname)
MEDIALIB_CXXFLAGS = $(__medialib_PCH_INC) -D__WX$(TOOLKIT)__ \
$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
$(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
$(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+MEDIALIB_OBJCXXFLAGS = $(__medialib_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
+ $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+ $(__INC_EXPAT_p) $(CPPFLAGS) $(OBJCXXFLAGS)
MEDIALIB_OBJECTS = \
medialib_mediactrlcmn.o \
$(__MEDIA_PLATFORM_SRC_OBJECTS_3)
-MEDIALIB_ODEP = $(___pch_wxprec_medialib_wx_wxprec_h_gch___depname)
+MEDIALIB_ODEP = $(_____pch_wxprec_medialib_wx_wxprec_h_gch___depname)
HTMLDLL_CXXFLAGS = $(__htmldll_PCH_INC) -D__WX$(TOOLKIT)__ \
$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
@@ -1408,7 +1468,7 @@ HTMLDLL_OBJECTS = \
htmldll_m_tables.o \
htmldll_winpars.o \
htmldll_htmllbox.o
-HTMLDLL_ODEP = $(___pch_wxprec_htmldll_wx_wxprec_h_gch___depname)
+HTMLDLL_ODEP = $(_____pch_wxprec_htmldll_wx_wxprec_h_gch___depname)
HTMLLIB_CXXFLAGS = $(__htmllib_PCH_INC) -D__WX$(TOOLKIT)__ \
$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
@@ -1439,7 +1499,7 @@ HTMLLIB_OBJECTS = \
htmllib_m_tables.o \
htmllib_winpars.o \
htmllib_htmllbox.o
-HTMLLIB_ODEP = $(___pch_wxprec_htmllib_wx_wxprec_h_gch___depname)
+HTMLLIB_ODEP = $(_____pch_wxprec_htmllib_wx_wxprec_h_gch___depname)
QADLL_CXXFLAGS = $(__qadll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
@@ -1450,7 +1510,7 @@ QADLL_OBJECTS = \
$(__qadll___win32rc) \
qadll_debugrpt.o \
qadll_dbgrptg.o
-QADLL_ODEP = $(___pch_wxprec_qadll_wx_wxprec_h_gch___depname)
+QADLL_ODEP = $(_____pch_wxprec_qadll_wx_wxprec_h_gch___depname)
QALIB_CXXFLAGS = $(__qalib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
@@ -1459,7 +1519,7 @@ QALIB_CXXFLAGS = $(__qalib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
QALIB_OBJECTS = \
qalib_debugrpt.o \
qalib_dbgrptg.o
-QALIB_ODEP = $(___pch_wxprec_qalib_wx_wxprec_h_gch___depname)
+QALIB_ODEP = $(_____pch_wxprec_qalib_wx_wxprec_h_gch___depname)
XMLDLL_CXXFLAGS = $(__xmldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
@@ -1470,7 +1530,7 @@ XMLDLL_OBJECTS = \
$(__xmldll___win32rc) \
xmldll_xml.o \
xmldll_xtixml.o
-XMLDLL_ODEP = $(___pch_wxprec_xmldll_wx_wxprec_h_gch___depname)
+XMLDLL_ODEP = $(_____pch_wxprec_xmldll_wx_wxprec_h_gch___depname)
XMLLIB_CXXFLAGS = $(__xmllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
@@ -1479,7 +1539,7 @@ XMLLIB_CXXFLAGS = $(__xmllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
XMLLIB_OBJECTS = \
xmllib_xml.o \
xmllib_xtixml.o
-XMLLIB_ODEP = $(___pch_wxprec_xmllib_wx_wxprec_h_gch___depname)
+XMLLIB_ODEP = $(_____pch_wxprec_xmllib_wx_wxprec_h_gch___depname)
XRCDLL_CXXFLAGS = $(__xrcdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
@@ -1546,7 +1606,7 @@ XRCDLL_OBJECTS = \
xrcdll_xmlres.o \
xrcdll_xmladv.o \
xrcdll_xmlrsall.o
-XRCDLL_ODEP = $(___pch_wxprec_xrcdll_wx_wxprec_h_gch___depname)
+XRCDLL_ODEP = $(_____pch_wxprec_xrcdll_wx_wxprec_h_gch___depname)
XRCLIB_CXXFLAGS = $(__xrclib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
@@ -1611,7 +1671,7 @@ XRCLIB_OBJECTS = \
xrclib_xmlres.o \
xrclib_xmladv.o \
xrclib_xmlrsall.o
-XRCLIB_ODEP = $(___pch_wxprec_xrclib_wx_wxprec_h_gch___depname)
+XRCLIB_ODEP = $(_____pch_wxprec_xrclib_wx_wxprec_h_gch___depname)
AUIDLL_CXXFLAGS = $(__auidll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
@@ -1626,7 +1686,7 @@ AUIDLL_OBJECTS = \
auidll_auibook.o \
auidll_auibar.o \
auidll_tabmdi.o
-AUIDLL_ODEP = $(___pch_wxprec_auidll_wx_wxprec_h_gch___depname)
+AUIDLL_ODEP = $(_____pch_wxprec_auidll_wx_wxprec_h_gch___depname)
AUILIB_CXXFLAGS = $(__auilib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
@@ -1639,7 +1699,7 @@ AUILIB_OBJECTS = \
auilib_auibook.o \
auilib_auibar.o \
auilib_tabmdi.o
-AUILIB_ODEP = $(___pch_wxprec_auilib_wx_wxprec_h_gch___depname)
+AUILIB_ODEP = $(_____pch_wxprec_auilib_wx_wxprec_h_gch___depname)
PROPGRIDDLL_CXXFLAGS = $(__propgriddll_PCH_INC) -D__WX$(TOOLKIT)__ \
$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
@@ -1656,7 +1716,7 @@ PROPGRIDDLL_OBJECTS = \
propgriddll_propgridiface.o \
propgriddll_propgridpagestate.o \
propgriddll_props.o
-PROPGRIDDLL_ODEP = $(___pch_wxprec_propgriddll_wx_wxprec_h_gch___depname)
+PROPGRIDDLL_ODEP = $(_____pch_wxprec_propgriddll_wx_wxprec_h_gch___depname)
PROPGRIDLIB_CXXFLAGS = $(__propgridlib_PCH_INC) -D__WX$(TOOLKIT)__ \
$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
@@ -1671,7 +1731,7 @@ PROPGRIDLIB_OBJECTS = \
propgridlib_propgridiface.o \
propgridlib_propgridpagestate.o \
propgridlib_props.o
-PROPGRIDLIB_ODEP = $(___pch_wxprec_propgridlib_wx_wxprec_h_gch___depname)
+PROPGRIDLIB_ODEP = $(_____pch_wxprec_propgridlib_wx_wxprec_h_gch___depname)
RICHTEXTDLL_CXXFLAGS = $(__richtextdll_PCH_INC) -D__WX$(TOOLKIT)__ \
$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
@@ -1689,7 +1749,7 @@ RICHTEXTDLL_OBJECTS = \
richtextdll_richtextsymboldlg.o \
richtextdll_richtextstyledlg.o \
richtextdll_richtextprint.o
-RICHTEXTDLL_ODEP = $(___pch_wxprec_richtextdll_wx_wxprec_h_gch___depname)
+RICHTEXTDLL_ODEP = $(_____pch_wxprec_richtextdll_wx_wxprec_h_gch___depname)
RICHTEXTLIB_CXXFLAGS = $(__richtextlib_PCH_INC) -D__WX$(TOOLKIT)__ \
$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
@@ -1705,7 +1765,7 @@ RICHTEXTLIB_OBJECTS = \
richtextlib_richtextsymboldlg.o \
richtextlib_richtextstyledlg.o \
richtextlib_richtextprint.o
-RICHTEXTLIB_ODEP = $(___pch_wxprec_richtextlib_wx_wxprec_h_gch___depname)
+RICHTEXTLIB_ODEP = $(_____pch_wxprec_richtextlib_wx_wxprec_h_gch___depname)
STCDLL_CXXFLAGS = $(__stcdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
@@ -1719,7 +1779,7 @@ STCDLL_OBJECTS = \
stcdll_stc.o \
stcdll_PlatWX.o \
stcdll_ScintillaWX.o
-STCDLL_ODEP = $(___pch_wxprec_stcdll_wx_wxprec_h_gch___depname)
+STCDLL_ODEP = $(_____pch_wxprec_stcdll_wx_wxprec_h_gch___depname)
STCLIB_CXXFLAGS = $(__stclib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
@@ -1731,27 +1791,37 @@ STCLIB_OBJECTS = \
stclib_stc.o \
stclib_PlatWX.o \
stclib_ScintillaWX.o
-STCLIB_ODEP = $(___pch_wxprec_stclib_wx_wxprec_h_gch___depname)
+STCLIB_ODEP = $(_____pch_wxprec_stclib_wx_wxprec_h_gch___depname)
GLDLL_CXXFLAGS = $(__gldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
$(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-DWXUSINGDLL -DWXMAKINGDLL_GL $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) \
$(CXXFLAGS)
+GLDLL_OBJCXXFLAGS = $(__gldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+ -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
+ $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+ -DWXUSINGDLL -DWXMAKINGDLL_GL $(PIC_FLAG) $(CPPFLAGS) $(OBJCXXFLAGS)
GLDLL_OBJECTS = \
$(__gldll___win32rc) \
gldll_glcmn.o \
$(__OPENGL_SRC_PLATFORM_OBJECTS)
-GLDLL_ODEP = $(___pch_wxprec_gldll_wx_wxprec_h_gch___depname)
+GLDLL_ODEP = $(_____pch_wxprec_gldll_wx_wxprec_h_gch___depname)
GLLIB_CXXFLAGS = $(__gllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
$(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+GLLIB_OBJCXXFLAGS = $(__gllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+ -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
+ $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) \
+ $(OBJCXXFLAGS)
GLLIB_OBJECTS = \
gllib_glcmn.o \
$(__OPENGL_SRC_PLATFORM_OBJECTS_1)
-GLLIB_ODEP = $(___pch_wxprec_gllib_wx_wxprec_h_gch___depname)
+GLLIB_ODEP = $(_____pch_wxprec_gllib_wx_wxprec_h_gch___depname)
SOUND_SDL_CXXFLAGS = -DWXUSINGDLL -DwxUSE_GUI=0 $(PIC_FLAG) $(CPPFLAGS) \
$(CXXFLAGS)
SOUND_SDL_OBJECTS = \
@@ -1774,7 +1844,7 @@ LOCALE_MSW_LINGUAS = it
@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG =
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -1786,54 +1856,54 @@ LOCALE_MSW_LINGUAS = it
@COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)
@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
-COND_WXUSE_REGEX_BUILTIN___wxregex___depname = \
+COND_wxUSE_REGEX_builtin___wxregex___depname = \
$(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_WXUSE_REGEX_BUILTIN@__wxregex___depname = $(COND_WXUSE_REGEX_BUILTIN___wxregex___depname)
-@COND_SHARED_0_WXUSE_REGEX_BUILTIN@__install_wxregex___depname \
-@COND_SHARED_0_WXUSE_REGEX_BUILTIN@ = install_wxregex
-@COND_SHARED_0_WXUSE_REGEX_BUILTIN@__uninstall_wxregex___depname \
-@COND_SHARED_0_WXUSE_REGEX_BUILTIN@ = uninstall_wxregex
-COND_WXUSE_ZLIB_BUILTIN___wxzlib___depname = \
+@COND_wxUSE_REGEX_builtin@__wxregex___depname = $(COND_wxUSE_REGEX_builtin___wxregex___depname)
+@COND_SHARED_0_wxUSE_REGEX_builtin@__install_wxregex___depname \
+@COND_SHARED_0_wxUSE_REGEX_builtin@ = install_wxregex
+@COND_SHARED_0_wxUSE_REGEX_builtin@__uninstall_wxregex___depname \
+@COND_SHARED_0_wxUSE_REGEX_builtin@ = uninstall_wxregex
+COND_wxUSE_ZLIB_builtin___wxzlib___depname = \
$(LIBDIRNAME)/$(LIBPREFIX)wxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_WXUSE_ZLIB_BUILTIN@__wxzlib___depname = $(COND_WXUSE_ZLIB_BUILTIN___wxzlib___depname)
-@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@__install_wxzlib___depname \
-@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@ = install_wxzlib
-@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@__uninstall_wxzlib___depname \
-@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@ = uninstall_wxzlib
-COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN___wxpng___depname = \
+@COND_wxUSE_ZLIB_builtin@__wxzlib___depname = $(COND_wxUSE_ZLIB_builtin___wxzlib___depname)
+@COND_SHARED_0_wxUSE_ZLIB_builtin@__install_wxzlib___depname \
+@COND_SHARED_0_wxUSE_ZLIB_builtin@ = install_wxzlib
+@COND_SHARED_0_wxUSE_ZLIB_builtin@__uninstall_wxzlib___depname \
+@COND_SHARED_0_wxUSE_ZLIB_builtin@ = uninstall_wxzlib
+COND_USE_GUI_1_wxUSE_LIBPNG_builtin___wxpng___depname = \
$(LIBDIRNAME)/$(LIBPREFIX)wxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__wxpng___depname = $(COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN___wxpng___depname)
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__install_wxpng___depname \
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = install_wxpng
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__uninstall_wxpng___depname \
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = uninstall_wxpng
-COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN___wxjpeg___depname = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__wxpng___depname = $(COND_USE_GUI_1_wxUSE_LIBPNG_builtin___wxpng___depname)
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin@__install_wxpng___depname \
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin@ = install_wxpng
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin@__uninstall_wxpng___depname \
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin@ = uninstall_wxpng
+COND_USE_GUI_1_wxUSE_LIBJPEG_builtin___wxjpeg___depname = \
$(LIBDIRNAME)/$(LIBPREFIX)wxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__wxjpeg___depname = $(COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN___wxjpeg___depname)
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__install_wxjpeg___depname \
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = install_wxjpeg
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__uninstall_wxjpeg___depname \
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = uninstall_wxjpeg
-COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN___wxtiff___depname = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__wxjpeg___depname = $(COND_USE_GUI_1_wxUSE_LIBJPEG_builtin___wxjpeg___depname)
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin@__install_wxjpeg___depname \
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = install_wxjpeg
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin@__uninstall_wxjpeg___depname \
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = uninstall_wxjpeg
+COND_USE_GUI_1_wxUSE_LIBTIFF_builtin___wxtiff___depname = \
$(LIBDIRNAME)/$(LIBPREFIX)wxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__wxtiff___depname = $(COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN___wxtiff___depname)
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__install_wxtiff___depname \
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = install_wxtiff
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__uninstall_wxtiff___depname \
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = uninstall_wxtiff
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__wxtiff___depname = $(COND_USE_GUI_1_wxUSE_LIBTIFF_builtin___wxtiff___depname)
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin@__install_wxtiff___depname \
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = install_wxtiff
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin@__uninstall_wxtiff___depname \
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = uninstall_wxtiff
@COND_PLATFORM_UNIX_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o
@COND_PLATFORM_MACOSX_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o
@COND_PLATFORM_OS2_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o
@COND_PLATFORM_WIN32_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_win32.o
@COND_PLATFORM_MACOS_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_apple.o
@COND_PLATFORM_MSDOS_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_msdos.o
-COND_WXUSE_EXPAT_BUILTIN___wxexpat___depname = \
+COND_wxUSE_EXPAT_builtin___wxexpat___depname = \
$(LIBDIRNAME)/$(LIBPREFIX)wxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_WXUSE_EXPAT_BUILTIN@__wxexpat___depname = $(COND_WXUSE_EXPAT_BUILTIN___wxexpat___depname)
-@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@__install_wxexpat___depname \
-@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@ = install_wxexpat
-@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@__uninstall_wxexpat___depname \
-@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@ = uninstall_wxexpat
+@COND_wxUSE_EXPAT_builtin@__wxexpat___depname = $(COND_wxUSE_EXPAT_builtin___wxexpat___depname)
+@COND_SHARED_0_wxUSE_EXPAT_builtin@__install_wxexpat___depname \
+@COND_SHARED_0_wxUSE_EXPAT_builtin@ = install_wxexpat
+@COND_SHARED_0_wxUSE_EXPAT_builtin@__uninstall_wxexpat___depname \
+@COND_SHARED_0_wxUSE_EXPAT_builtin@ = uninstall_wxexpat
COND_USE_STC_1___wxscintilla___depname = \
$(LIBDIRNAME)/$(LIBPREFIX)wxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
@COND_USE_STC_1@__wxscintilla___depname = $(COND_USE_STC_1___wxscintilla___depname)
@@ -1849,10 +1919,10 @@ COND_USE_STC_1___wxscintilla___depname = \
@COND_PLATFORM_UNIX_1@PLUGIN_VERSION0 = $(WX_VERSION)
@COND_PLATFORM_UNIX_0@PLUGVERDELIM =
@COND_PLATFORM_UNIX_1@PLUGVERDELIM = -
-@COND_BUILD_DEBUG_UNICODE_0@PLUGINSUFFIX = d
-@COND_BUILD_DEBUG_UNICODE_1@PLUGINSUFFIX = ud
-@COND_BUILD_RELEASE_UNICODE_0@PLUGINSUFFIX =
-@COND_BUILD_RELEASE_UNICODE_1@PLUGINSUFFIX = u
+@COND_BUILD_debug_UNICODE_0@PLUGINSUFFIX = d
+@COND_BUILD_debug_UNICODE_1@PLUGINSUFFIX = ud
+@COND_BUILD_release_UNICODE_0@PLUGINSUFFIX =
+@COND_BUILD_release_UNICODE_1@PLUGINSUFFIX = u
@COND_TOOLKIT_WINCE@BASE_WINCE_SRC = src/msw/wince/time.cpp
@COND_TOOLKIT_WINCE@BASE_WINCE_HDR = wx/msw/wince/time.h \
@COND_TOOLKIT_WINCE@ wx/msw/wince/chkconf.h
@@ -2371,12 +2441,8 @@ COND_TOOLKIT_MSW_LOWLEVEL_HDR = \
@COND_TOOLKIT_OSX_CARBON@LOWLEVEL_HDR =
@COND_TOOLKIT_OSX_COCOA@LOWLEVEL_HDR =
@COND_TOOLKIT_PM@LOWLEVEL_HDR =
-COND_TOOLKIT_WINCE_LOWLEVEL_HDR = \
- wx/msw/popupwin.h \
- wx/msw/uxtheme.h \
- wx/msw/uxthemep.h \
- wx/msw/htmlhelp.h
-@COND_TOOLKIT_WINCE@LOWLEVEL_HDR = $(COND_TOOLKIT_WINCE_LOWLEVEL_HDR)
+@COND_TOOLKIT_WINCE@LOWLEVEL_HDR = wx/msw/popupwin.h \
+@COND_TOOLKIT_WINCE@ wx/msw/uxtheme.h wx/msw/uxthemep.h wx/msw/htmlhelp.h
COND_TOOLKIT_X11_LOWLEVEL_HDR = \
wx/generic/caret.h \
wx/generic/imaglist.h \
@@ -3391,12 +3457,9 @@ COND_TOOLKIT_OSX_COCOA_ADVANCED_PLATFORM_HDR = \
@COND_TOOLKIT_OSX_COCOA@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_OSX_COCOA_ADVANCED_PLATFORM_HDR)
@COND_TOOLKIT_PM@ADVANCED_PLATFORM_HDR = \
@COND_TOOLKIT_PM@ wx/generic/animate.h wx/os2/joystick.h wx/os2/sound.h
-COND_TOOLKIT_WINCE_ADVANCED_PLATFORM_HDR = \
- wx/generic/animate.h \
- wx/msw/notifmsg.h \
- wx/msw/sound.h \
- wx/msw/taskbar.h
-@COND_TOOLKIT_WINCE@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_WINCE_ADVANCED_PLATFORM_HDR)
+@COND_TOOLKIT_WINCE@ADVANCED_PLATFORM_HDR = \
+@COND_TOOLKIT_WINCE@ wx/generic/animate.h wx/msw/notifmsg.h wx/msw/sound.h \
+@COND_TOOLKIT_WINCE@ wx/msw/taskbar.h
@COND_TOOLKIT_X11@ADVANCED_PLATFORM_HDR = \
@COND_TOOLKIT_X11@ wx/unix/joystick.h wx/unix/sound.h wx/unix/taskbarx11.h
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_NATIVE_HDR = \
@@ -3406,18 +3469,12 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_NATIVE_HDR = \
wx/gtk/dataview.h \
wx/gtk/hyperlink.h
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ADVANCED_PLATFORM_NATIVE_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_NATIVE_HDR)
-COND_TOOLKIT_MSW_ADVANCED_PLATFORM_NATIVE_HDR = \
- wx/msw/bmpcbox.h \
- wx/msw/calctrl.h \
- wx/msw/datecontrols.h \
- wx/msw/datectrl.h
-@COND_TOOLKIT_MSW@ADVANCED_PLATFORM_NATIVE_HDR = $(COND_TOOLKIT_MSW_ADVANCED_PLATFORM_NATIVE_HDR)
-COND_TOOLKIT_WINCE_ADVANCED_PLATFORM_NATIVE_HDR = \
- wx/msw/bmpcbox.h \
- wx/msw/calctrl.h \
- wx/msw/datecontrols.h \
- wx/msw/datectrl.h
-@COND_TOOLKIT_WINCE@ADVANCED_PLATFORM_NATIVE_HDR = $(COND_TOOLKIT_WINCE_ADVANCED_PLATFORM_NATIVE_HDR)
+@COND_TOOLKIT_MSW@ADVANCED_PLATFORM_NATIVE_HDR = \
+@COND_TOOLKIT_MSW@ wx/msw/bmpcbox.h wx/msw/calctrl.h wx/msw/datecontrols.h \
+@COND_TOOLKIT_MSW@ wx/msw/datectrl.h
+@COND_TOOLKIT_WINCE@ADVANCED_PLATFORM_NATIVE_HDR = \
+@COND_TOOLKIT_WINCE@ wx/msw/bmpcbox.h wx/msw/calctrl.h \
+@COND_TOOLKIT_WINCE@ wx/msw/datecontrols.h wx/msw/datectrl.h
COND_WXUNIV_0_ADVANCED_HDR = \
wx/aboutdlg.h \
wx/animate.h \
@@ -3890,11 +3947,11 @@ COND_PLATFORM_OS2_1___monodll___importlib = -import \
COND_WINDOWS_IMPLIB_1___monodll___importlib = \
-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_WINDOWS_IMPLIB_1@__monodll___importlib = $(COND_WINDOWS_IMPLIB_1___monodll___importlib)
-@COND_GCC_PCH_1@__monodll_PCH_INC = -I.pch/wxprec_monodll
+@COND_GCC_PCH_1@__monodll_PCH_INC = -I./.pch/wxprec_monodll
@COND_ICC_PCH_1@__monodll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_monodll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_monodll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_monodll/wx/wxprec.h.gch
+@COND_ICC_PCH_1@ ./.pch/wxprec_monodll/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_monodll_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@ = ./.pch/wxprec_monodll/wx/wxprec.h.gch
COND_USE_SOVERLINUX_1___monodll___soname_flags = \
$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
@COND_USE_SOVERLINUX_1@__monodll___soname_flags = $(COND_USE_SOVERLINUX_1___monodll___soname_flags)
@@ -3926,7 +3983,7 @@ COND_USE_SOSYMLINKS_1___monodll___so_symlinks_uninst_cmd = rm -f \
$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_USE_SOSYMLINKS_1@__monodll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___monodll___so_symlinks_uninst_cmd)
COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS = \
- monodll_mimetype.o \
+ monodll_core_mimetype.o \
monodll_cfstring.o \
monodll_gsockosx.o \
monodll_stdpaths_cf.o \
@@ -3937,17 +3994,18 @@ COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS = \
monodll_epolldispatcher.o \
monodll_appunix.o \
monodll_evtloopunix.o \
- monodll_dir.o \
+ monodll_unix_dir.o \
monodll_dlunix.o \
- monodll_snglinst.o \
- monodll_stdpaths.o \
+ monodll_unix_snglinst.o \
+ monodll_unix_stdpaths.o \
monodll_timerunx.o \
monodll_threadpsx.o \
- monodll_stackwalk.o \
+ monodll_unix_stackwalk.o \
monodll_utilsunx.o
@COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS)
@COND_PLATFORM_MSDOS_1@__BASE_PLATFORM_SRC_OBJECTS = \
-@COND_PLATFORM_MSDOS_1@ monodll_dir.o monodll_mimetype.o monodll_utilsdos.o
+@COND_PLATFORM_MSDOS_1@ monodll_msdos_dir.o monodll_msdos_mimetype.o \
+@COND_PLATFORM_MSDOS_1@ monodll_utilsdos.o
COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS = \
monodll_fdiodispatcher.o \
monodll_selectdispatcher.o \
@@ -3955,12 +4013,12 @@ COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS = \
monodll_appunix.o \
monodll_evtloopunix.o \
monodll_timerunx.o \
- monodll_dir.o \
- monodll_mimetype.o \
- monodll_stdpaths.o \
- monodll_thread.o \
- monodll_utils.o \
- monodll_utilsexc.o
+ monodll_os2_dir.o \
+ monodll_os2_mimetype.o \
+ monodll_os2_stdpaths.o \
+ monodll_os2_thread.o \
+ monodll_os2_utils.o \
+ monodll_os2_utilsexc.o
@COND_PLATFORM_OS2_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS)
COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS = \
monodll_fdiodispatcher.o \
@@ -3968,15 +4026,15 @@ COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS = \
monodll_epolldispatcher.o \
monodll_appunix.o \
monodll_evtloopunix.o \
- monodll_dir.o \
+ monodll_unix_dir.o \
monodll_dlunix.o \
- monodll_snglinst.o \
- monodll_stdpaths.o \
+ monodll_unix_snglinst.o \
+ monodll_unix_stdpaths.o \
monodll_timerunx.o \
monodll_threadpsx.o \
- monodll_stackwalk.o \
+ monodll_unix_stackwalk.o \
monodll_utilsunx.o \
- monodll_mimetype.o \
+ monodll_unix_mimetype.o \
monodll_gsocketiohandler.o
@COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS)
COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS = \
@@ -3984,35 +4042,35 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS = \
monodll_crashrpt.o \
monodll_debughlp.o \
monodll_dde.o \
- monodll_dir.o \
+ monodll_msw_dir.o \
monodll_dlmsw.o \
- monodll_mimetype.o \
+ monodll_msw_mimetype.o \
monodll_power.o \
monodll_regconf.o \
monodll_registry.o \
- monodll_snglinst.o \
- monodll_stackwalk.o \
- monodll_stdpaths.o \
- monodll_thread.o \
- monodll_timer.o \
- monodll_utils.o \
- monodll_utilsexc.o \
+ monodll_msw_snglinst.o \
+ monodll_msw_stackwalk.o \
+ monodll_msw_stdpaths.o \
+ monodll_msw_thread.o \
+ monodll_msw_timer.o \
+ monodll_msw_utils.o \
+ monodll_msw_utilsexc.o \
$(__BASE_WINCE_SRC_OBJECTS)
@COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS)
@COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS = monodll_time.o
@COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS =
@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \
-@COND_PLATFORM_WIN32_1@ = monodll_evtloop.o monodll_main.o monodll_mslu.o \
-@COND_PLATFORM_WIN32_1@ monodll_volume.o
+@COND_PLATFORM_WIN32_1@ = monodll_msw_evtloop.o monodll_msw_main.o \
+@COND_PLATFORM_WIN32_1@ monodll_mslu.o monodll_volume.o
@COND_TOOLKIT_OSX_CARBON@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS \
-@COND_TOOLKIT_OSX_CARBON@ = monodll_utils.o monodll_uma.o
+@COND_TOOLKIT_OSX_CARBON@ = monodll_carbon_utils.o monodll_uma.o
@COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS \
-@COND_TOOLKIT_OSX_COCOA@ = monodll_utils.o
-@COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS = monodll_gsocket.o
-@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS = monodll_gsocket.o
-@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS = monodll_gsocket.o
+@COND_TOOLKIT_OSX_COCOA@ = monodll_osx_cocoa_utils.o
+@COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS = monodll_unix_gsocket.o
+@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS = monodll_unix_gsocket.o
+@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS = monodll_unix_gsocket.o
COND_PLATFORM_WIN32_1___NET_PLATFORM_SRC_OBJECTS = \
- monodll_gsocket.o \
+ monodll_msw_gsocket.o \
monodll_gsockmsw.o \
monodll_urlmsw.o \
$(__NET_WINCE_SRC_OBJECTS)
@@ -4269,55 +4327,55 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \
COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \
$(__LOWLEVEL_SRC_OBJECTS_1) \
$(__PLATFORM_SRC_OBJECTS) \
- monodll_accel.o \
+ monodll_generic_accel.o \
monodll_clrpickerg.o \
monodll_collpaneg.o \
monodll_colrdlgg.o \
monodll_dirdlgg.o \
- monodll_fdrepdlg.o \
+ monodll_generic_fdrepdlg.o \
monodll_filedlgg.o \
monodll_filepickerg.o \
monodll_fontdlgg.o \
monodll_fontpickerg.o \
- monodll_listctrl.o \
+ monodll_generic_listctrl.o \
monodll_mdig.o \
monodll_msgdlgg.o \
monodll_prntdlgg.o \
monodll_tabg.o \
- monodll_bmpbuttn.o \
- monodll_button.o \
- monodll_checkbox.o \
- monodll_checklst.o \
- monodll_choice.o \
- monodll_combobox.o \
- monodll_control.o \
+ monodll_univ_bmpbuttn.o \
+ monodll_univ_button.o \
+ monodll_univ_checkbox.o \
+ monodll_univ_checklst.o \
+ monodll_univ_choice.o \
+ monodll_univ_combobox.o \
+ monodll_univ_control.o \
monodll_ctrlrend.o \
- monodll_dialog.o \
+ monodll_univ_dialog.o \
monodll_framuniv.o \
- monodll_gauge.o \
+ monodll_univ_gauge.o \
monodll_inpcons.o \
monodll_inphand.o \
- monodll_listbox.o \
- monodll_menu.o \
- monodll_notebook.o \
- monodll_radiobox.o \
- monodll_radiobut.o \
+ monodll_univ_listbox.o \
+ monodll_univ_menu.o \
+ monodll_univ_notebook.o \
+ monodll_univ_radiobox.o \
+ monodll_univ_radiobut.o \
monodll_scrarrow.o \
- monodll_scrolbar.o \
+ monodll_univ_scrolbar.o \
monodll_scrthumb.o \
monodll_settingsuniv.o \
- monodll_slider.o \
- monodll_spinbutt.o \
- monodll_statbmp.o \
- monodll_statbox.o \
- monodll_statline.o \
- monodll_stattext.o \
- monodll_statusbr.o \
+ monodll_univ_slider.o \
+ monodll_univ_spinbutt.o \
+ monodll_univ_statbmp.o \
+ monodll_univ_statbox.o \
+ monodll_univ_statline.o \
+ monodll_univ_stattext.o \
+ monodll_univ_statusbr.o \
monodll_stdrend.o \
- monodll_textctrl.o \
- monodll_tglbtn.o \
+ monodll_univ_textctrl.o \
+ monodll_univ_tglbtn.o \
monodll_theme.o \
- monodll_toolbar.o \
+ monodll_univ_toolbar.o \
monodll_topluniv.o \
monodll_winuniv.o \
monodll_gtk.o \
@@ -4456,209 +4514,209 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \
@COND_TOOLKIT_COCOA@ monodll_hid.o monodll_utilsexc_cf.o
COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS = \
monodll_fontmgrcmn.o \
- monodll_caret.o \
- monodll_colour.o \
- monodll_icon.o \
- monodll_imaglist.o \
+ monodll_generic_caret.o \
+ monodll_generic_colour.o \
+ monodll_generic_icon.o \
+ monodll_generic_imaglist.o \
monodll_mask.o \
- monodll_timer.o \
- monodll_app.o \
- monodll_bitmap.o \
- monodll_brush.o \
- monodll_cursor.o \
- monodll_dc.o \
- monodll_dcclient.o \
- monodll_dcmemory.o \
- monodll_dcscreen.o \
- monodll_evtloop.o \
- monodll_font.o \
- monodll_fontenum.o \
- monodll_fontmgr.o \
- monodll_nonownedwnd.o \
- monodll_overlay.o \
- monodll_pen.o \
- monodll_region.o \
- monodll_settings.o \
- monodll_toplevel.o \
- monodll_utils.o \
- monodll_window.o \
+ monodll_generic_timer.o \
+ monodll_dfb_app.o \
+ monodll_dfb_bitmap.o \
+ monodll_dfb_brush.o \
+ monodll_dfb_cursor.o \
+ monodll_dfb_dc.o \
+ monodll_dfb_dcclient.o \
+ monodll_dfb_dcmemory.o \
+ monodll_dfb_dcscreen.o \
+ monodll_dfb_evtloop.o \
+ monodll_dfb_font.o \
+ monodll_dfb_fontenum.o \
+ monodll_dfb_fontmgr.o \
+ monodll_dfb_nonownedwnd.o \
+ monodll_dfb_overlay.o \
+ monodll_dfb_pen.o \
+ monodll_dfb_region.o \
+ monodll_dfb_settings.o \
+ monodll_dfb_toplevel.o \
+ monodll_dfb_utils.o \
+ monodll_dfb_window.o \
monodll_wrapdfb.o
@COND_TOOLKIT_DFB@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS)
COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS = \
- monodll_caret.o \
- monodll_imaglist.o \
- monodll_dialup.o \
- monodll_fontenum.o \
- monodll_fontutil.o \
+ monodll_generic_caret.o \
+ monodll_generic_imaglist.o \
+ monodll_unix_dialup.o \
+ monodll_unix_fontenum.o \
+ monodll_unix_fontutil.o \
monodll_utilsx11.o \
monodll_displayx11.o \
- monodll_icon.o \
+ monodll_generic_icon.o \
monodll_paletteg.o \
- monodll_app.o \
- monodll_bitmap.o \
- monodll_brush.o \
- monodll_clipbrd.o \
- monodll_colour.o \
- monodll_cursor.o \
- monodll_data.o \
- monodll_dataobj.o \
- monodll_dc.o \
- monodll_dcclient.o \
- monodll_dcmemory.o \
- monodll_dcscreen.o \
- monodll_dnd.o \
- monodll_evtloop.o \
- monodll_font.o \
- monodll_gsockgtk.o \
- monodll_main.o \
- monodll_minifram.o \
- monodll_pen.o \
- monodll_popupwin.o \
- monodll_region.o \
- monodll_renderer.o \
- monodll_settings.o \
- monodll_timer.o \
- monodll_tooltip.o \
- monodll_toplevel.o \
- monodll_utilsgtk.o \
- monodll_win_gtk.o \
- monodll_window.o
+ monodll_gtk1_app.o \
+ monodll_gtk1_bitmap.o \
+ monodll_gtk1_brush.o \
+ monodll_gtk1_clipbrd.o \
+ monodll_gtk1_colour.o \
+ monodll_gtk1_cursor.o \
+ monodll_gtk1_data.o \
+ monodll_gtk1_dataobj.o \
+ monodll_gtk1_dc.o \
+ monodll_gtk1_dcclient.o \
+ monodll_gtk1_dcmemory.o \
+ monodll_gtk1_dcscreen.o \
+ monodll_gtk1_dnd.o \
+ monodll_gtk1_evtloop.o \
+ monodll_gtk1_font.o \
+ monodll_gtk1_gsockgtk.o \
+ monodll_gtk1_main.o \
+ monodll_gtk1_minifram.o \
+ monodll_gtk1_pen.o \
+ monodll_gtk1_popupwin.o \
+ monodll_gtk1_region.o \
+ monodll_gtk1_renderer.o \
+ monodll_gtk1_settings.o \
+ monodll_gtk1_timer.o \
+ monodll_gtk1_tooltip.o \
+ monodll_gtk1_toplevel.o \
+ monodll_gtk1_utilsgtk.o \
+ monodll_gtk1_win_gtk.o \
+ monodll_gtk1_window.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS)
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS = \
- monodll_caret.o \
- monodll_imaglist.o \
- monodll_dialup.o \
- monodll_fontenum.o \
- monodll_fontutil.o \
+ monodll_generic_caret.o \
+ monodll_generic_imaglist.o \
+ monodll_unix_dialup.o \
+ monodll_unix_fontenum.o \
+ monodll_unix_fontutil.o \
monodll_utilsx11.o \
monodll_displayx11.o \
- monodll_icon.o \
+ monodll_generic_icon.o \
monodll_paletteg.o \
- monodll_app.o \
+ monodll_gtk_app.o \
monodll_assertdlg_gtk.o \
- monodll_bitmap.o \
- monodll_brush.o \
- monodll_clipbrd.o \
- monodll_colour.o \
- monodll_cursor.o \
- monodll_dataobj.o \
- monodll_dc.o \
- monodll_dcclient.o \
- monodll_dcmemory.o \
- monodll_dcscreen.o \
- monodll_dnd.o \
- monodll_evtloop.o \
+ monodll_gtk_bitmap.o \
+ monodll_gtk_brush.o \
+ monodll_gtk_clipbrd.o \
+ monodll_gtk_colour.o \
+ monodll_gtk_cursor.o \
+ monodll_gtk_dataobj.o \
+ monodll_gtk_dc.o \
+ monodll_gtk_dcclient.o \
+ monodll_gtk_dcmemory.o \
+ monodll_gtk_dcscreen.o \
+ monodll_gtk_dnd.o \
+ monodll_gtk_evtloop.o \
monodll_filectrl.o \
- monodll_font.o \
- monodll_gsockgtk.o \
- monodll_minifram.o \
- monodll_pen.o \
- monodll_popupwin.o \
+ monodll_gtk_font.o \
+ monodll_gtk_gsockgtk.o \
+ monodll_gtk_minifram.o \
+ monodll_gtk_pen.o \
+ monodll_gtk_popupwin.o \
monodll_private.o \
- monodll_region.o \
- monodll_renderer.o \
- monodll_settings.o \
- monodll_timer.o \
- monodll_tooltip.o \
- monodll_toplevel.o \
- monodll_utilsgtk.o \
- monodll_win_gtk.o \
- monodll_window.o
+ monodll_gtk_region.o \
+ monodll_gtk_renderer.o \
+ monodll_gtk_settings.o \
+ monodll_gtk_timer.o \
+ monodll_gtk_tooltip.o \
+ monodll_gtk_toplevel.o \
+ monodll_gtk_utilsgtk.o \
+ monodll_gtk_win_gtk.o \
+ monodll_gtk_window.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS)
COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS = \
monodll_fontmgrcmn.o \
- monodll_caret.o \
- monodll_colour.o \
- monodll_icon.o \
- monodll_imaglist.o \
+ monodll_generic_caret.o \
+ monodll_generic_colour.o \
+ monodll_generic_icon.o \
+ monodll_generic_imaglist.o \
monodll_mask.o \
- monodll_timer.o \
- monodll_app.o \
- monodll_bitmap.o \
- monodll_brush.o \
- monodll_clipbrd.o \
- monodll_cursor.o \
- monodll_data.o \
- monodll_dc.o \
- monodll_dcclient.o \
- monodll_dcmemory.o \
- monodll_dcscreen.o \
+ monodll_generic_timer.o \
+ monodll_mgl_app.o \
+ monodll_mgl_bitmap.o \
+ monodll_mgl_brush.o \
+ monodll_mgl_clipbrd.o \
+ monodll_mgl_cursor.o \
+ monodll_mgl_data.o \
+ monodll_mgl_dc.o \
+ monodll_mgl_dcclient.o \
+ monodll_mgl_dcmemory.o \
+ monodll_mgl_dcscreen.o \
monodll_dirmgl.o \
- monodll_evtloop.o \
- monodll_font.o \
- monodll_fontenum.o \
- monodll_fontmgr.o \
- monodll_fontutil.o \
- monodll_palette.o \
- monodll_pen.o \
- monodll_region.o \
- monodll_settings.o \
- monodll_toplevel.o \
- monodll_utils.o \
- monodll_window.o
+ monodll_mgl_evtloop.o \
+ monodll_mgl_font.o \
+ monodll_mgl_fontenum.o \
+ monodll_mgl_fontmgr.o \
+ monodll_mgl_fontutil.o \
+ monodll_mgl_palette.o \
+ monodll_mgl_pen.o \
+ monodll_mgl_region.o \
+ monodll_mgl_settings.o \
+ monodll_mgl_toplevel.o \
+ monodll_mgl_utils.o \
+ monodll_mgl_window.o
@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS)
COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS = \
- monodll_caret.o \
- monodll_imaglist.o \
- monodll_dialup.o \
- monodll_fontenum.o \
- monodll_fontutil.o \
+ monodll_generic_caret.o \
+ monodll_generic_imaglist.o \
+ monodll_unix_dialup.o \
+ monodll_unix_fontenum.o \
+ monodll_unix_fontutil.o \
monodll_utilsx11.o \
monodll_displayx11.o \
- monodll_bitmap.o \
- monodll_brush.o \
- monodll_palette.o \
- monodll_pen.o \
- monodll_region.o \
+ monodll_x11_bitmap.o \
+ monodll_x11_brush.o \
+ monodll_x11_palette.o \
+ monodll_x11_pen.o \
+ monodll_x11_region.o \
monodll_utilsx.o
@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS)
COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \
- monodll_app.o \
- monodll_bitmap.o \
- monodll_brush.o \
- monodll_caret.o \
- monodll_clipbrd.o \
- monodll_colour.o \
- monodll_cursor.o \
- monodll_data.o \
- monodll_dc.o \
- monodll_dcclient.o \
- monodll_dcmemory.o \
- monodll_dcprint.o \
- monodll_dcscreen.o \
- monodll_dialup.o \
+ monodll_msw_app.o \
+ monodll_msw_bitmap.o \
+ monodll_msw_brush.o \
+ monodll_msw_caret.o \
+ monodll_msw_clipbrd.o \
+ monodll_msw_colour.o \
+ monodll_msw_cursor.o \
+ monodll_msw_data.o \
+ monodll_msw_dc.o \
+ monodll_msw_dcclient.o \
+ monodll_msw_dcmemory.o \
+ monodll_msw_dcprint.o \
+ monodll_msw_dcscreen.o \
+ monodll_msw_dialup.o \
monodll_dib.o \
- monodll_display.o \
+ monodll_msw_display.o \
monodll_enhmeta.o \
- monodll_font.o \
- monodll_fontenum.o \
- monodll_fontutil.o \
- monodll_gdiimage.o \
- monodll_gdiobj.o \
+ monodll_msw_font.o \
+ monodll_msw_fontenum.o \
+ monodll_msw_fontutil.o \
+ monodll_msw_gdiimage.o \
+ monodll_msw_gdiobj.o \
monodll_gdiplus.o \
- monodll_graphics.o \
- monodll_icon.o \
- monodll_imaglist.o \
- monodll_minifram.o \
- monodll_dataobj.o \
+ monodll_msw_graphics.o \
+ monodll_msw_icon.o \
+ monodll_msw_imaglist.o \
+ monodll_msw_minifram.o \
+ monodll_ole_dataobj.o \
monodll_dropsrc.o \
monodll_droptgt.o \
monodll_oleutils.o \
- monodll_palette.o \
- monodll_pen.o \
- monodll_popupwin.o \
- monodll_printdlg.o \
+ monodll_msw_palette.o \
+ monodll_msw_pen.o \
+ monodll_msw_popupwin.o \
+ monodll_msw_printdlg.o \
monodll_printwin.o \
- monodll_region.o \
- monodll_renderer.o \
- monodll_settings.o \
- monodll_tooltip.o \
- monodll_toplevel.o \
- monodll_utilsgui.o \
+ monodll_msw_region.o \
+ monodll_msw_renderer.o \
+ monodll_msw_settings.o \
+ monodll_msw_tooltip.o \
+ monodll_msw_toplevel.o \
+ monodll_msw_utilsgui.o \
monodll_uxtheme.o \
- monodll_window.o \
+ monodll_msw_window.o \
monodll_helpchm.o \
- monodll_helpwin.o \
+ monodll_msw_helpwin.o \
monodll_automtn.o \
monodll_uuid.o
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS)
@@ -4668,87 +4726,87 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \
@COND_TOOLKIT_OSX_COCOA@ $(__OSX_LOWLEVEL_SRC_OBJECTS)
@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS =
COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS = \
- monodll_app.o \
- monodll_bitmap.o \
- monodll_brush.o \
- monodll_caret.o \
- monodll_clipbrd.o \
- monodll_colour.o \
- monodll_cursor.o \
- monodll_data.o \
- monodll_dc.o \
- monodll_dcclient.o \
- monodll_dcmemory.o \
- monodll_dcprint.o \
- monodll_dcscreen.o \
- monodll_dialup.o \
+ monodll_msw_app.o \
+ monodll_msw_bitmap.o \
+ monodll_msw_brush.o \
+ monodll_msw_caret.o \
+ monodll_msw_clipbrd.o \
+ monodll_msw_colour.o \
+ monodll_msw_cursor.o \
+ monodll_msw_data.o \
+ monodll_msw_dc.o \
+ monodll_msw_dcclient.o \
+ monodll_msw_dcmemory.o \
+ monodll_msw_dcprint.o \
+ monodll_msw_dcscreen.o \
+ monodll_msw_dialup.o \
monodll_dib.o \
- monodll_display.o \
+ monodll_msw_display.o \
monodll_enhmeta.o \
- monodll_font.o \
- monodll_fontenum.o \
- monodll_fontutil.o \
- monodll_gdiimage.o \
- monodll_gdiobj.o \
+ monodll_msw_font.o \
+ monodll_msw_fontenum.o \
+ monodll_msw_fontutil.o \
+ monodll_msw_gdiimage.o \
+ monodll_msw_gdiobj.o \
monodll_gdiplus.o \
- monodll_graphics.o \
- monodll_icon.o \
- monodll_imaglist.o \
- monodll_minifram.o \
- monodll_dataobj.o \
+ monodll_msw_graphics.o \
+ monodll_msw_icon.o \
+ monodll_msw_imaglist.o \
+ monodll_msw_minifram.o \
+ monodll_ole_dataobj.o \
monodll_dropsrc.o \
monodll_droptgt.o \
monodll_oleutils.o \
- monodll_palette.o \
- monodll_pen.o \
- monodll_popupwin.o \
- monodll_printdlg.o \
+ monodll_msw_palette.o \
+ monodll_msw_pen.o \
+ monodll_msw_popupwin.o \
+ monodll_msw_printdlg.o \
monodll_printwin.o \
- monodll_region.o \
- monodll_renderer.o \
- monodll_settings.o \
- monodll_tooltip.o \
- monodll_toplevel.o \
- monodll_utilsgui.o \
+ monodll_msw_region.o \
+ monodll_msw_renderer.o \
+ monodll_msw_settings.o \
+ monodll_msw_tooltip.o \
+ monodll_msw_toplevel.o \
+ monodll_msw_utilsgui.o \
monodll_uxtheme.o \
- monodll_window.o
+ monodll_msw_window.o
@COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS)
COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS = \
- monodll_caret.o \
- monodll_imaglist.o \
- monodll_dialup.o \
- monodll_fontenum.o \
- monodll_fontutil.o \
+ monodll_generic_caret.o \
+ monodll_generic_imaglist.o \
+ monodll_unix_dialup.o \
+ monodll_unix_fontenum.o \
+ monodll_unix_fontutil.o \
monodll_utilsx11.o \
monodll_displayx11.o \
- monodll_icon.o \
- monodll_timer.o \
- monodll_app.o \
- monodll_bitmap.o \
- monodll_brush.o \
- monodll_clipbrd.o \
- monodll_colour.o \
- monodll_cursor.o \
- monodll_data.o \
- monodll_dataobj.o \
- monodll_dc.o \
- monodll_dcclient.o \
- monodll_dcmemory.o \
- monodll_dcscreen.o \
- monodll_evtloop.o \
- monodll_font.o \
- monodll_minifram.o \
+ monodll_generic_icon.o \
+ monodll_generic_timer.o \
+ monodll_x11_app.o \
+ monodll_x11_bitmap.o \
+ monodll_x11_brush.o \
+ monodll_x11_clipbrd.o \
+ monodll_x11_colour.o \
+ monodll_x11_cursor.o \
+ monodll_x11_data.o \
+ monodll_x11_dataobj.o \
+ monodll_x11_dc.o \
+ monodll_x11_dcclient.o \
+ monodll_x11_dcmemory.o \
+ monodll_x11_dcscreen.o \
+ monodll_x11_evtloop.o \
+ monodll_x11_font.o \
+ monodll_x11_minifram.o \
monodll_nanox.o \
- monodll_palette.o \
- monodll_pen.o \
- monodll_popupwin.o \
- monodll_region.o \
+ monodll_x11_palette.o \
+ monodll_x11_pen.o \
+ monodll_x11_popupwin.o \
+ monodll_x11_region.o \
monodll_reparent.o \
- monodll_settings.o \
- monodll_toplevel.o \
- monodll_utils.o \
+ monodll_x11_settings.o \
+ monodll_x11_toplevel.o \
+ monodll_x11_utils.o \
monodll_utilsx.o \
- monodll_window.o
+ monodll_x11_window.o
@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS)
COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS = \
monodll_NSBox.o \
@@ -4764,256 +4822,256 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS = \
monodll_NSView.o \
monodll_NSWindow.o \
monodll_ObjcRef.o \
- monodll_app.o \
- monodll_bitmap.o \
- monodll_bmpbuttn.o \
- monodll_brush.o \
- monodll_button.o \
- monodll_checkbox.o \
- monodll_checklst.o \
- monodll_choice.o \
- monodll_clipbrd.o \
- monodll_colordlg.o \
- monodll_colour.o \
- monodll_combobox.o \
- monodll_control.o \
- monodll_cursor.o \
- monodll_data.o \
- monodll_dataobj.o \
- monodll_dc.o \
- monodll_dcclient.o \
- monodll_dcmemory.o \
- monodll_dcscreen.o \
- monodll_dialog.o \
- monodll_dirdlg.o \
- monodll_display.o \
- monodll_drawer.o \
- monodll_evtloop.o \
- monodll_filedlg.o \
- monodll_font.o \
- monodll_fontdlg.o \
- monodll_fontenum.o \
- monodll_fontutil.o \
- monodll_frame.o \
- monodll_gauge.o \
- monodll_icon.o \
- monodll_listbox.o \
- monodll_main.o \
+ monodll_cocoa_app.o \
+ monodll_cocoa_bitmap.o \
+ monodll_src_cocoa_bmpbuttn.o \
+ monodll_cocoa_brush.o \
+ monodll_src_cocoa_button.o \
+ monodll_src_cocoa_checkbox.o \
+ monodll_cocoa_checklst.o \
+ monodll_src_cocoa_choice.o \
+ monodll_cocoa_clipbrd.o \
+ monodll_cocoa_colordlg.o \
+ monodll_cocoa_colour.o \
+ monodll_cocoa_combobox.o \
+ monodll_cocoa_control.o \
+ monodll_cocoa_cursor.o \
+ monodll_cocoa_data.o \
+ monodll_cocoa_dataobj.o \
+ monodll_cocoa_dc.o \
+ monodll_cocoa_dcclient.o \
+ monodll_cocoa_dcmemory.o \
+ monodll_cocoa_dcscreen.o \
+ monodll_src_cocoa_dialog.o \
+ monodll_src_cocoa_dirdlg.o \
+ monodll_cocoa_display.o \
+ monodll_cocoa_drawer.o \
+ monodll_src_cocoa_evtloop.o \
+ monodll_src_cocoa_filedlg.o \
+ monodll_cocoa_font.o \
+ monodll_cocoa_fontdlg.o \
+ monodll_cocoa_fontenum.o \
+ monodll_cocoa_fontutil.o \
+ monodll_cocoa_frame.o \
+ monodll_src_cocoa_gauge.o \
+ monodll_cocoa_icon.o \
+ monodll_src_cocoa_listbox.o \
+ monodll_cocoa_main.o \
monodll_mbarman.o \
- monodll_mdi.o \
- monodll_menu.o \
- monodll_menuitem.o \
- monodll_msgdlg.o \
- monodll_notebook.o \
- monodll_pen.o \
- monodll_radiobox.o \
- monodll_radiobut.o \
- monodll_region.o \
- monodll_scrolbar.o \
- monodll_settings.o \
- monodll_slider.o \
- monodll_sound.o \
- monodll_spinbutt.o \
- monodll_statbmp.o \
- monodll_statbox.o \
+ monodll_cocoa_mdi.o \
+ monodll_src_cocoa_menu.o \
+ monodll_src_cocoa_menuitem.o \
+ monodll_src_cocoa_msgdlg.o \
+ monodll_src_cocoa_notebook.o \
+ monodll_cocoa_pen.o \
+ monodll_cocoa_radiobox.o \
+ monodll_src_cocoa_radiobut.o \
+ monodll_cocoa_region.o \
+ monodll_src_cocoa_scrolbar.o \
+ monodll_cocoa_settings.o \
+ monodll_src_cocoa_slider.o \
+ monodll_cocoa_sound.o \
+ monodll_src_cocoa_spinbutt.o \
+ monodll_cocoa_statbmp.o \
+ monodll_src_cocoa_statbox.o \
monodll_statline2.o \
- monodll_stattext.o \
- monodll_textctrl.o \
- monodll_timer.o \
- monodll_toolbar.o \
- monodll_tooltip.o \
- monodll_toplevel.o \
- monodll_utils.o \
- monodll_utilsexc.o \
- monodll_window.o \
- monodll_accel.o \
- monodll_caret.o \
+ monodll_src_cocoa_stattext.o \
+ monodll_src_cocoa_textctrl.o \
+ monodll_cocoa_timer.o \
+ monodll_src_cocoa_toolbar.o \
+ monodll_src_cocoa_tooltip.o \
+ monodll_cocoa_toplevel.o \
+ monodll_src_cocoa_utils.o \
+ monodll_cocoa_utilsexc.o \
+ monodll_src_cocoa_window.o \
+ monodll_generic_accel.o \
+ monodll_generic_caret.o \
monodll_clrpickerg.o \
monodll_collpaneg.o \
monodll_colrdlgg.o \
- monodll_fdrepdlg.o \
+ monodll_generic_fdrepdlg.o \
monodll_filepickerg.o \
monodll_fontdlgg.o \
monodll_fontpickerg.o \
- monodll_imaglist.o \
- monodll_listctrl.o \
+ monodll_generic_imaglist.o \
+ monodll_generic_listctrl.o \
monodll_msgdlgg.o \
monodll_paletteg.o \
monodll_regiong.o \
- monodll_statusbr.o \
+ monodll_generic_statusbr.o \
monodll_tabg.o
@COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS)
COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS = \
- monodll_accel.o \
+ monodll_generic_accel.o \
monodll_clrpickerg.o \
monodll_collpaneg.o \
monodll_colrdlgg.o \
monodll_dirdlgg.o \
- monodll_fdrepdlg.o \
+ monodll_generic_fdrepdlg.o \
monodll_filedlgg.o \
monodll_filepickerg.o \
monodll_fontdlgg.o \
monodll_fontpickerg.o \
- monodll_listctrl.o \
+ monodll_generic_listctrl.o \
monodll_msgdlgg.o \
monodll_prntdlgg.o \
- monodll_statusbr.o \
+ monodll_generic_statusbr.o \
monodll_tabg.o \
- monodll_bmpbuttn.o \
- monodll_button.o \
- monodll_checkbox.o \
- monodll_checklst.o \
- monodll_choice.o \
- monodll_combobox.o \
- monodll_control.o \
- monodll_dialog.o \
- monodll_filedlg.o \
- monodll_fontdlg.o \
- monodll_frame.o \
- monodll_gauge.o \
- monodll_listbox.o \
- monodll_mdi.o \
- monodll_menu.o \
- monodll_notebook.o \
- monodll_radiobox.o \
- monodll_radiobut.o \
- monodll_scrolbar.o \
- monodll_scrolwin.o \
- monodll_slider.o \
- monodll_spinbutt.o \
- monodll_spinctrl.o \
- monodll_statbmp.o \
- monodll_statbox.o \
- monodll_statline.o \
- monodll_stattext.o \
- monodll_tbargtk.o \
- monodll_textctrl.o \
- monodll_tglbtn.o
+ monodll_gtk1_bmpbuttn.o \
+ monodll_gtk1_button.o \
+ monodll_gtk1_checkbox.o \
+ monodll_gtk1_checklst.o \
+ monodll_gtk1_choice.o \
+ monodll_gtk1_combobox.o \
+ monodll_gtk1_control.o \
+ monodll_gtk1_dialog.o \
+ monodll_gtk1_filedlg.o \
+ monodll_gtk1_fontdlg.o \
+ monodll_gtk1_frame.o \
+ monodll_gtk1_gauge.o \
+ monodll_gtk1_listbox.o \
+ monodll_gtk1_mdi.o \
+ monodll_gtk1_menu.o \
+ monodll_gtk1_notebook.o \
+ monodll_gtk1_radiobox.o \
+ monodll_gtk1_radiobut.o \
+ monodll_gtk1_scrolbar.o \
+ monodll_gtk1_scrolwin.o \
+ monodll_gtk1_slider.o \
+ monodll_gtk1_spinbutt.o \
+ monodll_gtk1_spinctrl.o \
+ monodll_gtk1_statbmp.o \
+ monodll_gtk1_statbox.o \
+ monodll_gtk1_statline.o \
+ monodll_gtk1_stattext.o \
+ monodll_gtk1_tbargtk.o \
+ monodll_gtk1_textctrl.o \
+ monodll_gtk1_tglbtn.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS)
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS = \
- monodll_accel.o \
- monodll_fdrepdlg.o \
+ monodll_generic_accel.o \
+ monodll_generic_fdrepdlg.o \
monodll_filepickerg.o \
monodll_graphicc.o \
- monodll_listctrl.o \
+ monodll_generic_listctrl.o \
monodll_prntdlgg.o \
- monodll_statusbr.o \
+ monodll_generic_statusbr.o \
monodll_tabg.o \
monodll_fontdlgg.o \
monodll_msgdlgg.o \
monodll_artgtk.o \
- monodll_bmpbuttn.o \
- monodll_button.o \
- monodll_checkbox.o \
- monodll_checklst.o \
- monodll_choice.o \
+ monodll_gtk_bmpbuttn.o \
+ monodll_gtk_button.o \
+ monodll_gtk_checkbox.o \
+ monodll_gtk_checklst.o \
+ monodll_gtk_choice.o \
monodll_collpane.o \
- monodll_colordlg.o \
- monodll_combobox.o \
- monodll_control.o \
+ monodll_gtk_colordlg.o \
+ monodll_gtk_combobox.o \
+ monodll_gtk_control.o \
monodll_clrpicker.o \
- monodll_dialog.o \
+ monodll_gtk_dialog.o \
monodll_fontpicker.o \
monodll_filepicker.o \
- monodll_dirdlg.o \
- monodll_filedlg.o \
- monodll_fontdlg.o \
- monodll_frame.o \
- monodll_gauge.o \
+ monodll_gtk_dirdlg.o \
+ monodll_gtk_filedlg.o \
+ monodll_gtk_fontdlg.o \
+ monodll_gtk_frame.o \
+ monodll_gtk_gauge.o \
monodll_gprint.o \
monodll_gvfs.o \
- monodll_print.o \
- monodll_listbox.o \
- monodll_mdi.o \
- monodll_menu.o \
+ monodll_gtk_print.o \
+ monodll_gtk_listbox.o \
+ monodll_gtk_mdi.o \
+ monodll_gtk_menu.o \
monodll_mnemonics.o \
- monodll_msgdlg.o \
- monodll_nativewin.o \
- monodll_notebook.o \
- monodll_radiobox.o \
- monodll_radiobut.o \
- monodll_scrolbar.o \
- monodll_scrolwin.o \
- monodll_slider.o \
- monodll_spinbutt.o \
- monodll_spinctrl.o \
- monodll_statbmp.o \
- monodll_statbox.o \
- monodll_statline.o \
- monodll_stattext.o \
- monodll_tbargtk.o \
- monodll_textctrl.o \
- monodll_textentry.o \
- monodll_tglbtn.o \
+ monodll_gtk_msgdlg.o \
+ monodll_gtk_nativewin.o \
+ monodll_gtk_notebook.o \
+ monodll_gtk_radiobox.o \
+ monodll_gtk_radiobut.o \
+ monodll_gtk_scrolbar.o \
+ monodll_gtk_scrolwin.o \
+ monodll_gtk_slider.o \
+ monodll_gtk_spinbutt.o \
+ monodll_gtk_spinctrl.o \
+ monodll_gtk_statbmp.o \
+ monodll_gtk_statbox.o \
+ monodll_gtk_statline.o \
+ monodll_gtk_stattext.o \
+ monodll_gtk_tbargtk.o \
+ monodll_gtk_textctrl.o \
+ monodll_gtk_textentry.o \
+ monodll_gtk_tglbtn.o \
monodll_treeentry_gtk.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS)
COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS = \
- monodll_accel.o \
- monodll_app.o \
- monodll_bmpbuttn.o \
+ monodll_motif_accel.o \
+ monodll_motif_app.o \
+ monodll_motif_bmpbuttn.o \
monodll_bmpmotif.o \
- monodll_button.o \
- monodll_checkbox.o \
- monodll_checklst.o \
- monodll_choice.o \
- monodll_clipbrd.o \
- monodll_colour.o \
- monodll_combobox.o \
+ monodll_motif_button.o \
+ monodll_motif_checkbox.o \
+ monodll_motif_checklst.o \
+ monodll_motif_choice.o \
+ monodll_motif_clipbrd.o \
+ monodll_motif_colour.o \
+ monodll_motif_combobox.o \
monodll_combobox_native.o \
- monodll_control.o \
- monodll_cursor.o \
- monodll_data.o \
- monodll_dataobj.o \
- monodll_dc.o \
- monodll_dcclient.o \
- monodll_dcmemory.o \
- monodll_dcscreen.o \
- monodll_dialog.o \
- monodll_evtloop.o \
- monodll_filedlg.o \
- monodll_font.o \
- monodll_frame.o \
- monodll_gauge.o \
+ monodll_motif_control.o \
+ monodll_motif_cursor.o \
+ monodll_motif_data.o \
+ monodll_motif_dataobj.o \
+ monodll_motif_dc.o \
+ monodll_motif_dcclient.o \
+ monodll_motif_dcmemory.o \
+ monodll_motif_dcscreen.o \
+ monodll_motif_dialog.o \
+ monodll_motif_evtloop.o \
+ monodll_motif_filedlg.o \
+ monodll_motif_font.o \
+ monodll_motif_frame.o \
+ monodll_motif_gauge.o \
monodll_gsockmot.o \
- monodll_icon.o \
- monodll_listbox.o \
- monodll_main.o \
- monodll_mdi.o \
- monodll_menu.o \
- monodll_menuitem.o \
- monodll_minifram.o \
- monodll_msgdlg.o \
- monodll_popupwin.o \
- monodll_radiobox.o \
- monodll_radiobut.o \
- monodll_scrolbar.o \
- monodll_settings.o \
- monodll_slider.o \
- monodll_spinbutt.o \
- monodll_statbmp.o \
- monodll_statbox.o \
- monodll_stattext.o \
- monodll_textctrl.o \
- monodll_textentry.o \
- monodll_timer.o \
- monodll_toolbar.o \
- monodll_toplevel.o \
- monodll_utils.o \
- monodll_window.o \
+ monodll_motif_icon.o \
+ monodll_motif_listbox.o \
+ monodll_motif_main.o \
+ monodll_motif_mdi.o \
+ monodll_motif_menu.o \
+ monodll_motif_menuitem.o \
+ monodll_motif_minifram.o \
+ monodll_motif_msgdlg.o \
+ monodll_motif_popupwin.o \
+ monodll_motif_radiobox.o \
+ monodll_motif_radiobut.o \
+ monodll_motif_scrolbar.o \
+ monodll_motif_settings.o \
+ monodll_motif_slider.o \
+ monodll_motif_spinbutt.o \
+ monodll_motif_statbmp.o \
+ monodll_motif_statbox.o \
+ monodll_motif_stattext.o \
+ monodll_motif_textctrl.o \
+ monodll_motif_textentry.o \
+ monodll_motif_timer.o \
+ monodll_motif_toolbar.o \
+ monodll_motif_toplevel.o \
+ monodll_motif_utils.o \
+ monodll_motif_window.o \
monodll_xmcombo.o \
monodll_clrpickerg.o \
monodll_collpaneg.o \
monodll_colrdlgg.o \
monodll_dirdlgg.o \
- monodll_fdrepdlg.o \
+ monodll_generic_fdrepdlg.o \
monodll_filepickerg.o \
monodll_fontdlgg.o \
monodll_fontpickerg.o \
- monodll_listctrl.o \
- monodll_notebook.o \
+ monodll_generic_listctrl.o \
+ monodll_generic_notebook.o \
monodll_prntdlgg.o \
- monodll_statline.o \
- monodll_statusbr.o \
+ monodll_generic_statline.o \
+ monodll_generic_statusbr.o \
monodll_tabg.o
@COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS)
COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \
@@ -5021,291 +5079,291 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \
monodll_collpaneg.o \
monodll_filepickerg.o \
monodll_fontpickerg.o \
- monodll_statusbr.o \
+ monodll_generic_statusbr.o \
monodll_prntdlgg.o \
- monodll_accel.o \
- monodll_bmpbuttn.o \
- monodll_button.o \
- monodll_checkbox.o \
- monodll_choice.o \
- monodll_colordlg.o \
+ monodll_msw_accel.o \
+ monodll_msw_bmpbuttn.o \
+ monodll_msw_button.o \
+ monodll_msw_checkbox.o \
+ monodll_msw_choice.o \
+ monodll_msw_colordlg.o \
monodll_combo.o \
- monodll_combobox.o \
- monodll_control.o \
- monodll_dialog.o \
- monodll_dirdlg.o \
+ monodll_msw_combobox.o \
+ monodll_msw_control.o \
+ monodll_msw_dialog.o \
+ monodll_msw_dirdlg.o \
monodll_dragimag.o \
- monodll_filedlg.o \
- monodll_frame.o \
- monodll_gauge.o \
- monodll_iniconf.o \
- monodll_listbox.o \
- monodll_listctrl.o \
- monodll_mdi.o \
- monodll_menu.o \
- monodll_menuitem.o \
- monodll_metafile.o \
- monodll_msgdlg.o \
- monodll_nativdlg.o \
- monodll_nativewin.o \
- monodll_notebook.o \
+ monodll_msw_filedlg.o \
+ monodll_msw_frame.o \
+ monodll_msw_gauge.o \
+ monodll_msw_iniconf.o \
+ monodll_msw_listbox.o \
+ monodll_msw_listctrl.o \
+ monodll_msw_mdi.o \
+ monodll_msw_menu.o \
+ monodll_msw_menuitem.o \
+ monodll_msw_metafile.o \
+ monodll_msw_msgdlg.o \
+ monodll_msw_nativdlg.o \
+ monodll_msw_nativewin.o \
+ monodll_msw_notebook.o \
monodll_access.o \
- monodll_ownerdrw.o \
- monodll_radiobox.o \
- monodll_radiobut.o \
- monodll_scrolbar.o \
- monodll_slider.o \
- monodll_spinbutt.o \
- monodll_spinctrl.o \
- monodll_statbmp.o \
- monodll_statbox.o \
+ monodll_msw_ownerdrw.o \
+ monodll_msw_radiobox.o \
+ monodll_msw_radiobut.o \
+ monodll_msw_scrolbar.o \
+ monodll_msw_slider.o \
+ monodll_msw_spinbutt.o \
+ monodll_msw_spinctrl.o \
+ monodll_msw_statbmp.o \
+ monodll_msw_statbox.o \
monodll_statusbar.o \
- monodll_statline.o \
- monodll_stattext.o \
- monodll_tabctrl.o \
- monodll_toolbar.o \
- monodll_textctrl.o \
- monodll_textentry.o \
- monodll_tglbtn.o \
+ monodll_msw_statline.o \
+ monodll_msw_stattext.o \
+ monodll_msw_tabctrl.o \
+ monodll_msw_toolbar.o \
+ monodll_msw_textctrl.o \
+ monodll_msw_textentry.o \
+ monodll_msw_tglbtn.o \
monodll_treectrl.o \
- monodll_checklst.o \
- monodll_fdrepdlg.o \
- monodll_fontdlg.o
+ monodll_msw_checklst.o \
+ monodll_msw_fdrepdlg.o \
+ monodll_msw_fontdlg.o
@COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS)
COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS = \
$(__OSX_CARBON_COCOA_SRC_OBJECTS) \
- monodll_bmpbuttn.o \
- monodll_button.o \
- monodll_checkbox.o \
- monodll_choice.o \
- monodll_colordlg.o \
- monodll_dialog.o \
- monodll_dirdlg.o \
- monodll_evtloop.o \
- monodll_filedlg.o \
- monodll_gauge.o \
- monodll_listbox.o \
+ monodll_carbon_bmpbuttn.o \
+ monodll_carbon_button.o \
+ monodll_carbon_checkbox.o \
+ monodll_carbon_choice.o \
+ monodll_carbon_colordlg.o \
+ monodll_carbon_dialog.o \
+ monodll_carbon_dirdlg.o \
+ monodll_carbon_evtloop.o \
+ monodll_carbon_filedlg.o \
+ monodll_carbon_gauge.o \
+ monodll_carbon_listbox.o \
monodll_listctrl_mac.o \
- monodll_menu.o \
- monodll_menuitem.o \
- monodll_msgdlg.o \
- monodll_nonownedwnd.o \
+ monodll_carbon_menu.o \
+ monodll_carbon_menuitem.o \
+ monodll_carbon_msgdlg.o \
+ monodll_carbon_nonownedwnd.o \
monodll_notebmac.o \
- monodll_radiobut.o \
- monodll_region.o \
- monodll_scrolbar.o \
- monodll_slider.o \
- monodll_spinbutt.o \
- monodll_srchctrl.o \
- monodll_statbmp.o \
- monodll_statbox.o \
+ monodll_carbon_radiobut.o \
+ monodll_carbon_region.o \
+ monodll_carbon_scrolbar.o \
+ monodll_carbon_slider.o \
+ monodll_carbon_spinbutt.o \
+ monodll_carbon_srchctrl.o \
+ monodll_carbon_statbmp.o \
+ monodll_carbon_statbox.o \
monodll_statlmac.o \
- monodll_stattext.o \
- monodll_textctrl.o \
- monodll_tglbtn.o \
- monodll_toolbar.o \
- monodll_tooltip.o \
- monodll_window.o \
+ monodll_carbon_stattext.o \
+ monodll_carbon_textctrl.o \
+ monodll_carbon_tglbtn.o \
+ monodll_carbon_toolbar.o \
+ monodll_carbon_tooltip.o \
+ monodll_carbon_window.o \
monodll_webkit.o \
- monodll_caret.o \
+ monodll_generic_caret.o \
monodll_clrpickerg.o \
monodll_collpaneg.o \
- monodll_fdrepdlg.o \
+ monodll_generic_fdrepdlg.o \
monodll_filepickerg.o \
monodll_fontdlgg.o \
monodll_fontpickerg.o \
- monodll_listctrl.o \
+ monodll_generic_listctrl.o \
monodll_prntdlgg.o \
- monodll_statusbr.o \
+ monodll_generic_statusbr.o \
monodll_tabg.o
@COND_TOOLKIT_OSX_CARBON@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS)
COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS = \
$(__OSX_CARBON_COCOA_SRC_OBJECTS) \
- monodll_bmpbuttn.o \
- monodll_button.o \
- monodll_checkbox.o \
- monodll_choice.o \
- monodll_dialog.o \
- monodll_dirdlg.o \
- monodll_evtloop.o \
- monodll_filedlg.o \
- monodll_gauge.o \
- monodll_listbox.o \
- monodll_menu.o \
- monodll_menuitem.o \
- monodll_msgdlg.o \
- monodll_nonownedwnd.o \
- monodll_notebook.o \
- monodll_radiobut.o \
- monodll_scrolbar.o \
- monodll_slider.o \
- monodll_spinbutt.o \
- monodll_srchctrl.o \
- monodll_statbox.o \
- monodll_statline.o \
- monodll_stattext.o \
- monodll_textctrl.o \
- monodll_tglbtn.o \
- monodll_toolbar.o \
- monodll_tooltip.o \
- monodll_window.o \
- monodll_caret.o \
+ monodll_osx_cocoa_bmpbuttn.o \
+ monodll_osx_cocoa_button.o \
+ monodll_osx_cocoa_checkbox.o \
+ monodll_osx_cocoa_choice.o \
+ monodll_osx_cocoa_dialog.o \
+ monodll_osx_cocoa_dirdlg.o \
+ monodll_osx_cocoa_evtloop.o \
+ monodll_osx_cocoa_filedlg.o \
+ monodll_osx_cocoa_gauge.o \
+ monodll_osx_cocoa_listbox.o \
+ monodll_osx_cocoa_menu.o \
+ monodll_osx_cocoa_menuitem.o \
+ monodll_osx_cocoa_msgdlg.o \
+ monodll_cocoa_nonownedwnd.o \
+ monodll_osx_cocoa_notebook.o \
+ monodll_osx_cocoa_radiobut.o \
+ monodll_osx_cocoa_scrolbar.o \
+ monodll_osx_cocoa_slider.o \
+ monodll_osx_cocoa_spinbutt.o \
+ monodll_cocoa_srchctrl.o \
+ monodll_osx_cocoa_statbox.o \
+ monodll_cocoa_statline.o \
+ monodll_osx_cocoa_stattext.o \
+ monodll_osx_cocoa_textctrl.o \
+ monodll_cocoa_tglbtn.o \
+ monodll_osx_cocoa_toolbar.o \
+ monodll_osx_cocoa_tooltip.o \
+ monodll_osx_cocoa_window.o \
+ monodll_generic_caret.o \
monodll_clrpickerg.o \
monodll_collpaneg.o \
- monodll_fdrepdlg.o \
+ monodll_generic_fdrepdlg.o \
monodll_filepickerg.o \
monodll_fontdlgg.o \
monodll_fontpickerg.o \
- monodll_listctrl.o \
+ monodll_generic_listctrl.o \
monodll_prntdlgg.o \
monodll_regiong.o \
- monodll_statusbr.o \
+ monodll_generic_statusbr.o \
monodll_tabg.o
@COND_TOOLKIT_OSX_COCOA@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS)
COND_TOOLKIT_PM___GUI_SRC_OBJECTS = \
- monodll_caret.o \
+ monodll_generic_caret.o \
monodll_clrpickerg.o \
monodll_collpaneg.o \
monodll_colrdlgg.o \
monodll_dirdlgg.o \
- monodll_fdrepdlg.o \
+ monodll_generic_fdrepdlg.o \
monodll_filepickerg.o \
monodll_fontpickerg.o \
- monodll_imaglist.o \
- monodll_listctrl.o \
+ monodll_generic_imaglist.o \
+ monodll_generic_listctrl.o \
monodll_mdig.o \
monodll_prntdlgg.o \
- monodll_statusbr.o \
- monodll_accel.o \
- monodll_app.o \
- monodll_bitmap.o \
- monodll_bmpbuttn.o \
- monodll_brush.o \
- monodll_button.o \
- monodll_checkbox.o \
- monodll_checklst.o \
- monodll_choice.o \
- monodll_clipbrd.o \
- monodll_colour.o \
- monodll_combobox.o \
- monodll_control.o \
- monodll_cursor.o \
- monodll_data.o \
- monodll_dataobj.o \
- monodll_dc.o \
- monodll_dcclient.o \
- monodll_dcmemory.o \
- monodll_dcprint.o \
- monodll_dcscreen.o \
- monodll_dialog.o \
- monodll_dnd.o \
- monodll_evtloop.o \
- monodll_filedlg.o \
- monodll_font.o \
- monodll_fontdlg.o \
- monodll_fontenum.o \
- monodll_fontutil.o \
- monodll_frame.o \
- monodll_gauge.o \
- monodll_gdiimage.o \
+ monodll_generic_statusbr.o \
+ monodll_os2_accel.o \
+ monodll_os2_app.o \
+ monodll_os2_bitmap.o \
+ monodll_os2_bmpbuttn.o \
+ monodll_os2_brush.o \
+ monodll_os2_button.o \
+ monodll_os2_checkbox.o \
+ monodll_os2_checklst.o \
+ monodll_os2_choice.o \
+ monodll_os2_clipbrd.o \
+ monodll_os2_colour.o \
+ monodll_os2_combobox.o \
+ monodll_os2_control.o \
+ monodll_os2_cursor.o \
+ monodll_os2_data.o \
+ monodll_os2_dataobj.o \
+ monodll_os2_dc.o \
+ monodll_os2_dcclient.o \
+ monodll_os2_dcmemory.o \
+ monodll_os2_dcprint.o \
+ monodll_os2_dcscreen.o \
+ monodll_os2_dialog.o \
+ monodll_os2_dnd.o \
+ monodll_os2_evtloop.o \
+ monodll_os2_filedlg.o \
+ monodll_os2_font.o \
+ monodll_os2_fontdlg.o \
+ monodll_os2_fontenum.o \
+ monodll_os2_fontutil.o \
+ monodll_os2_frame.o \
+ monodll_os2_gauge.o \
+ monodll_os2_gdiimage.o \
monodll_gsockpm.o \
- monodll_helpwin.o \
- monodll_icon.o \
- monodll_iniconf.o \
- monodll_listbox.o \
- monodll_main.o \
- monodll_menu.o \
- monodll_menuitem.o \
- monodll_metafile.o \
- monodll_minifram.o \
- monodll_msgdlg.o \
- monodll_nativdlg.o \
- monodll_notebook.o \
- monodll_ownerdrw.o \
- monodll_palette.o \
- monodll_pen.o \
- monodll_popupwin.o \
- monodll_print.o \
- monodll_radiobox.o \
- monodll_radiobut.o \
- monodll_region.o \
- monodll_scrolbar.o \
- monodll_settings.o \
- monodll_slider.o \
- monodll_spinbutt.o \
- monodll_spinctrl.o \
- monodll_statbmp.o \
- monodll_statbox.o \
- monodll_statline.o \
- monodll_stattext.o \
- monodll_tabctrl.o \
- monodll_textctrl.o \
- monodll_textentry.o \
- monodll_tglbtn.o \
- monodll_timer.o \
- monodll_toolbar.o \
- monodll_tooltip.o \
- monodll_toplevel.o \
- monodll_utilsgui.o \
- monodll_window.o
+ monodll_os2_helpwin.o \
+ monodll_os2_icon.o \
+ monodll_os2_iniconf.o \
+ monodll_os2_listbox.o \
+ monodll_os2_main.o \
+ monodll_os2_menu.o \
+ monodll_os2_menuitem.o \
+ monodll_os2_metafile.o \
+ monodll_os2_minifram.o \
+ monodll_os2_msgdlg.o \
+ monodll_os2_nativdlg.o \
+ monodll_os2_notebook.o \
+ monodll_os2_ownerdrw.o \
+ monodll_os2_palette.o \
+ monodll_os2_pen.o \
+ monodll_os2_popupwin.o \
+ monodll_os2_print.o \
+ monodll_os2_radiobox.o \
+ monodll_os2_radiobut.o \
+ monodll_os2_region.o \
+ monodll_os2_scrolbar.o \
+ monodll_os2_settings.o \
+ monodll_os2_slider.o \
+ monodll_os2_spinbutt.o \
+ monodll_os2_spinctrl.o \
+ monodll_os2_statbmp.o \
+ monodll_os2_statbox.o \
+ monodll_os2_statline.o \
+ monodll_os2_stattext.o \
+ monodll_os2_tabctrl.o \
+ monodll_os2_textctrl.o \
+ monodll_os2_textentry.o \
+ monodll_os2_tglbtn.o \
+ monodll_os2_timer.o \
+ monodll_os2_toolbar.o \
+ monodll_os2_tooltip.o \
+ monodll_os2_toplevel.o \
+ monodll_os2_utilsgui.o \
+ monodll_os2_window.o
@COND_TOOLKIT_PM@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS)
COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS = \
monodll_clrpickerg.o \
monodll_collpaneg.o \
monodll_filepickerg.o \
monodll_fontpickerg.o \
- monodll_statusbr.o \
+ monodll_generic_statusbr.o \
monodll_prntdlgg.o \
- monodll_accel.o \
- monodll_bmpbuttn.o \
- monodll_button.o \
- monodll_checkbox.o \
- monodll_choice.o \
- monodll_colordlg.o \
+ monodll_msw_accel.o \
+ monodll_msw_bmpbuttn.o \
+ monodll_msw_button.o \
+ monodll_msw_checkbox.o \
+ monodll_msw_choice.o \
+ monodll_msw_colordlg.o \
monodll_combo.o \
- monodll_combobox.o \
- monodll_control.o \
- monodll_dialog.o \
- monodll_dirdlg.o \
+ monodll_msw_combobox.o \
+ monodll_msw_control.o \
+ monodll_msw_dialog.o \
+ monodll_msw_dirdlg.o \
monodll_dragimag.o \
- monodll_filedlg.o \
- monodll_frame.o \
- monodll_gauge.o \
- monodll_iniconf.o \
- monodll_listbox.o \
- monodll_listctrl.o \
- monodll_mdi.o \
- monodll_menu.o \
- monodll_menuitem.o \
- monodll_metafile.o \
- monodll_msgdlg.o \
- monodll_nativdlg.o \
- monodll_nativewin.o \
- monodll_notebook.o \
+ monodll_msw_filedlg.o \
+ monodll_msw_frame.o \
+ monodll_msw_gauge.o \
+ monodll_msw_iniconf.o \
+ monodll_msw_listbox.o \
+ monodll_msw_listctrl.o \
+ monodll_msw_mdi.o \
+ monodll_msw_menu.o \
+ monodll_msw_menuitem.o \
+ monodll_msw_metafile.o \
+ monodll_msw_msgdlg.o \
+ monodll_msw_nativdlg.o \
+ monodll_msw_nativewin.o \
+ monodll_msw_notebook.o \
monodll_access.o \
- monodll_ownerdrw.o \
- monodll_radiobox.o \
- monodll_radiobut.o \
- monodll_scrolbar.o \
- monodll_slider.o \
- monodll_spinbutt.o \
- monodll_spinctrl.o \
- monodll_statbmp.o \
- monodll_statbox.o \
+ monodll_msw_ownerdrw.o \
+ monodll_msw_radiobox.o \
+ monodll_msw_radiobut.o \
+ monodll_msw_scrolbar.o \
+ monodll_msw_slider.o \
+ monodll_msw_spinbutt.o \
+ monodll_msw_spinctrl.o \
+ monodll_msw_statbmp.o \
+ monodll_msw_statbox.o \
monodll_statusbar.o \
- monodll_statline.o \
- monodll_stattext.o \
- monodll_tabctrl.o \
- monodll_toolbar.o \
- monodll_textctrl.o \
- monodll_textentry.o \
- monodll_tglbtn.o \
+ monodll_msw_statline.o \
+ monodll_msw_stattext.o \
+ monodll_msw_tabctrl.o \
+ monodll_msw_toolbar.o \
+ monodll_msw_textctrl.o \
+ monodll_msw_textentry.o \
+ monodll_msw_tglbtn.o \
monodll_treectrl.o \
monodll_dirdlgg.o \
- monodll_fdrepdlg.o \
+ monodll_generic_fdrepdlg.o \
monodll_filedlgg.o \
monodll_fontdlgg.o \
- monodll_checklst.o \
+ monodll_wince_checklst.o \
monodll_choicece.o \
monodll_crt.o \
monodll_filedlgwce.o \
@@ -5319,209 +5377,209 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS = \
@COND_TOOLKIT_COCOA@ monodll_hid.o monodll_utilsexc_cf.o
COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_1 = \
monodll_fontmgrcmn.o \
- monodll_caret.o \
- monodll_colour.o \
- monodll_icon.o \
- monodll_imaglist.o \
+ monodll_generic_caret.o \
+ monodll_generic_colour.o \
+ monodll_generic_icon.o \
+ monodll_generic_imaglist.o \
monodll_mask.o \
- monodll_timer.o \
- monodll_app.o \
- monodll_bitmap.o \
- monodll_brush.o \
- monodll_cursor.o \
- monodll_dc.o \
- monodll_dcclient.o \
- monodll_dcmemory.o \
- monodll_dcscreen.o \
- monodll_evtloop.o \
- monodll_font.o \
- monodll_fontenum.o \
- monodll_fontmgr.o \
- monodll_nonownedwnd.o \
- monodll_overlay.o \
- monodll_pen.o \
- monodll_region.o \
- monodll_settings.o \
- monodll_toplevel.o \
- monodll_utils.o \
- monodll_window.o \
+ monodll_generic_timer.o \
+ monodll_dfb_app.o \
+ monodll_dfb_bitmap.o \
+ monodll_dfb_brush.o \
+ monodll_dfb_cursor.o \
+ monodll_dfb_dc.o \
+ monodll_dfb_dcclient.o \
+ monodll_dfb_dcmemory.o \
+ monodll_dfb_dcscreen.o \
+ monodll_dfb_evtloop.o \
+ monodll_dfb_font.o \
+ monodll_dfb_fontenum.o \
+ monodll_dfb_fontmgr.o \
+ monodll_dfb_nonownedwnd.o \
+ monodll_dfb_overlay.o \
+ monodll_dfb_pen.o \
+ monodll_dfb_region.o \
+ monodll_dfb_settings.o \
+ monodll_dfb_toplevel.o \
+ monodll_dfb_utils.o \
+ monodll_dfb_window.o \
monodll_wrapdfb.o
@COND_TOOLKIT_DFB@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_1)
COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_1 = \
- monodll_caret.o \
- monodll_imaglist.o \
- monodll_dialup.o \
- monodll_fontenum.o \
- monodll_fontutil.o \
+ monodll_generic_caret.o \
+ monodll_generic_imaglist.o \
+ monodll_unix_dialup.o \
+ monodll_unix_fontenum.o \
+ monodll_unix_fontutil.o \
monodll_utilsx11.o \
monodll_displayx11.o \
- monodll_icon.o \
+ monodll_generic_icon.o \
monodll_paletteg.o \
- monodll_app.o \
- monodll_bitmap.o \
- monodll_brush.o \
- monodll_clipbrd.o \
- monodll_colour.o \
- monodll_cursor.o \
- monodll_data.o \
- monodll_dataobj.o \
- monodll_dc.o \
- monodll_dcclient.o \
- monodll_dcmemory.o \
- monodll_dcscreen.o \
- monodll_dnd.o \
- monodll_evtloop.o \
- monodll_font.o \
- monodll_gsockgtk.o \
- monodll_main.o \
- monodll_minifram.o \
- monodll_pen.o \
- monodll_popupwin.o \
- monodll_region.o \
- monodll_renderer.o \
- monodll_settings.o \
- monodll_timer.o \
- monodll_tooltip.o \
- monodll_toplevel.o \
- monodll_utilsgtk.o \
- monodll_win_gtk.o \
- monodll_window.o
+ monodll_gtk1_app.o \
+ monodll_gtk1_bitmap.o \
+ monodll_gtk1_brush.o \
+ monodll_gtk1_clipbrd.o \
+ monodll_gtk1_colour.o \
+ monodll_gtk1_cursor.o \
+ monodll_gtk1_data.o \
+ monodll_gtk1_dataobj.o \
+ monodll_gtk1_dc.o \
+ monodll_gtk1_dcclient.o \
+ monodll_gtk1_dcmemory.o \
+ monodll_gtk1_dcscreen.o \
+ monodll_gtk1_dnd.o \
+ monodll_gtk1_evtloop.o \
+ monodll_gtk1_font.o \
+ monodll_gtk1_gsockgtk.o \
+ monodll_gtk1_main.o \
+ monodll_gtk1_minifram.o \
+ monodll_gtk1_pen.o \
+ monodll_gtk1_popupwin.o \
+ monodll_gtk1_region.o \
+ monodll_gtk1_renderer.o \
+ monodll_gtk1_settings.o \
+ monodll_gtk1_timer.o \
+ monodll_gtk1_tooltip.o \
+ monodll_gtk1_toplevel.o \
+ monodll_gtk1_utilsgtk.o \
+ monodll_gtk1_win_gtk.o \
+ monodll_gtk1_window.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_1)
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_1 = \
- monodll_caret.o \
- monodll_imaglist.o \
- monodll_dialup.o \
- monodll_fontenum.o \
- monodll_fontutil.o \
+ monodll_generic_caret.o \
+ monodll_generic_imaglist.o \
+ monodll_unix_dialup.o \
+ monodll_unix_fontenum.o \
+ monodll_unix_fontutil.o \
monodll_utilsx11.o \
monodll_displayx11.o \
- monodll_icon.o \
+ monodll_generic_icon.o \
monodll_paletteg.o \
- monodll_app.o \
+ monodll_gtk_app.o \
monodll_assertdlg_gtk.o \
- monodll_bitmap.o \
- monodll_brush.o \
- monodll_clipbrd.o \
- monodll_colour.o \
- monodll_cursor.o \
- monodll_dataobj.o \
- monodll_dc.o \
- monodll_dcclient.o \
- monodll_dcmemory.o \
- monodll_dcscreen.o \
- monodll_dnd.o \
- monodll_evtloop.o \
+ monodll_gtk_bitmap.o \
+ monodll_gtk_brush.o \
+ monodll_gtk_clipbrd.o \
+ monodll_gtk_colour.o \
+ monodll_gtk_cursor.o \
+ monodll_gtk_dataobj.o \
+ monodll_gtk_dc.o \
+ monodll_gtk_dcclient.o \
+ monodll_gtk_dcmemory.o \
+ monodll_gtk_dcscreen.o \
+ monodll_gtk_dnd.o \
+ monodll_gtk_evtloop.o \
monodll_filectrl.o \
- monodll_font.o \
- monodll_gsockgtk.o \
- monodll_minifram.o \
- monodll_pen.o \
- monodll_popupwin.o \
+ monodll_gtk_font.o \
+ monodll_gtk_gsockgtk.o \
+ monodll_gtk_minifram.o \
+ monodll_gtk_pen.o \
+ monodll_gtk_popupwin.o \
monodll_private.o \
- monodll_region.o \
- monodll_renderer.o \
- monodll_settings.o \
- monodll_timer.o \
- monodll_tooltip.o \
- monodll_toplevel.o \
- monodll_utilsgtk.o \
- monodll_win_gtk.o \
- monodll_window.o
+ monodll_gtk_region.o \
+ monodll_gtk_renderer.o \
+ monodll_gtk_settings.o \
+ monodll_gtk_timer.o \
+ monodll_gtk_tooltip.o \
+ monodll_gtk_toplevel.o \
+ monodll_gtk_utilsgtk.o \
+ monodll_gtk_win_gtk.o \
+ monodll_gtk_window.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_1)
COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_1 = \
monodll_fontmgrcmn.o \
- monodll_caret.o \
- monodll_colour.o \
- monodll_icon.o \
- monodll_imaglist.o \
+ monodll_generic_caret.o \
+ monodll_generic_colour.o \
+ monodll_generic_icon.o \
+ monodll_generic_imaglist.o \
monodll_mask.o \
- monodll_timer.o \
- monodll_app.o \
- monodll_bitmap.o \
- monodll_brush.o \
- monodll_clipbrd.o \
- monodll_cursor.o \
- monodll_data.o \
- monodll_dc.o \
- monodll_dcclient.o \
- monodll_dcmemory.o \
- monodll_dcscreen.o \
+ monodll_generic_timer.o \
+ monodll_mgl_app.o \
+ monodll_mgl_bitmap.o \
+ monodll_mgl_brush.o \
+ monodll_mgl_clipbrd.o \
+ monodll_mgl_cursor.o \
+ monodll_mgl_data.o \
+ monodll_mgl_dc.o \
+ monodll_mgl_dcclient.o \
+ monodll_mgl_dcmemory.o \
+ monodll_mgl_dcscreen.o \
monodll_dirmgl.o \
- monodll_evtloop.o \
- monodll_font.o \
- monodll_fontenum.o \
- monodll_fontmgr.o \
- monodll_fontutil.o \
- monodll_palette.o \
- monodll_pen.o \
- monodll_region.o \
- monodll_settings.o \
- monodll_toplevel.o \
- monodll_utils.o \
- monodll_window.o
+ monodll_mgl_evtloop.o \
+ monodll_mgl_font.o \
+ monodll_mgl_fontenum.o \
+ monodll_mgl_fontmgr.o \
+ monodll_mgl_fontutil.o \
+ monodll_mgl_palette.o \
+ monodll_mgl_pen.o \
+ monodll_mgl_region.o \
+ monodll_mgl_settings.o \
+ monodll_mgl_toplevel.o \
+ monodll_mgl_utils.o \
+ monodll_mgl_window.o
@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_1)
COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_1 = \
- monodll_caret.o \
- monodll_imaglist.o \
- monodll_dialup.o \
- monodll_fontenum.o \
- monodll_fontutil.o \
+ monodll_generic_caret.o \
+ monodll_generic_imaglist.o \
+ monodll_unix_dialup.o \
+ monodll_unix_fontenum.o \
+ monodll_unix_fontutil.o \
monodll_utilsx11.o \
monodll_displayx11.o \
- monodll_bitmap.o \
- monodll_brush.o \
- monodll_palette.o \
- monodll_pen.o \
- monodll_region.o \
+ monodll_x11_bitmap.o \
+ monodll_x11_brush.o \
+ monodll_x11_palette.o \
+ monodll_x11_pen.o \
+ monodll_x11_region.o \
monodll_utilsx.o
@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_1)
COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 = \
- monodll_app.o \
- monodll_bitmap.o \
- monodll_brush.o \
- monodll_caret.o \
- monodll_clipbrd.o \
- monodll_colour.o \
- monodll_cursor.o \
- monodll_data.o \
- monodll_dc.o \
- monodll_dcclient.o \
- monodll_dcmemory.o \
- monodll_dcprint.o \
- monodll_dcscreen.o \
- monodll_dialup.o \
+ monodll_msw_app.o \
+ monodll_msw_bitmap.o \
+ monodll_msw_brush.o \
+ monodll_msw_caret.o \
+ monodll_msw_clipbrd.o \
+ monodll_msw_colour.o \
+ monodll_msw_cursor.o \
+ monodll_msw_data.o \
+ monodll_msw_dc.o \
+ monodll_msw_dcclient.o \
+ monodll_msw_dcmemory.o \
+ monodll_msw_dcprint.o \
+ monodll_msw_dcscreen.o \
+ monodll_msw_dialup.o \
monodll_dib.o \
- monodll_display.o \
+ monodll_msw_display.o \
monodll_enhmeta.o \
- monodll_font.o \
- monodll_fontenum.o \
- monodll_fontutil.o \
- monodll_gdiimage.o \
- monodll_gdiobj.o \
+ monodll_msw_font.o \
+ monodll_msw_fontenum.o \
+ monodll_msw_fontutil.o \
+ monodll_msw_gdiimage.o \
+ monodll_msw_gdiobj.o \
monodll_gdiplus.o \
- monodll_graphics.o \
- monodll_icon.o \
- monodll_imaglist.o \
- monodll_minifram.o \
- monodll_dataobj.o \
+ monodll_msw_graphics.o \
+ monodll_msw_icon.o \
+ monodll_msw_imaglist.o \
+ monodll_msw_minifram.o \
+ monodll_ole_dataobj.o \
monodll_dropsrc.o \
monodll_droptgt.o \
monodll_oleutils.o \
- monodll_palette.o \
- monodll_pen.o \
- monodll_popupwin.o \
- monodll_printdlg.o \
+ monodll_msw_palette.o \
+ monodll_msw_pen.o \
+ monodll_msw_popupwin.o \
+ monodll_msw_printdlg.o \
monodll_printwin.o \
- monodll_region.o \
- monodll_renderer.o \
- monodll_settings.o \
- monodll_tooltip.o \
- monodll_toplevel.o \
- monodll_utilsgui.o \
+ monodll_msw_region.o \
+ monodll_msw_renderer.o \
+ monodll_msw_settings.o \
+ monodll_msw_tooltip.o \
+ monodll_msw_toplevel.o \
+ monodll_msw_utilsgui.o \
monodll_uxtheme.o \
- monodll_window.o \
+ monodll_msw_window.o \
monodll_helpchm.o \
- monodll_helpwin.o \
+ monodll_msw_helpwin.o \
monodll_automtn.o \
monodll_uuid.o
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1)
@@ -5531,87 +5589,87 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 = \
@COND_TOOLKIT_OSX_COCOA@ $(__OSX_LOWLEVEL_SRC_OBJECTS)
@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_1 =
COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_1 = \
- monodll_app.o \
- monodll_bitmap.o \
- monodll_brush.o \
- monodll_caret.o \
- monodll_clipbrd.o \
- monodll_colour.o \
- monodll_cursor.o \
- monodll_data.o \
- monodll_dc.o \
- monodll_dcclient.o \
- monodll_dcmemory.o \
- monodll_dcprint.o \
- monodll_dcscreen.o \
- monodll_dialup.o \
+ monodll_msw_app.o \
+ monodll_msw_bitmap.o \
+ monodll_msw_brush.o \
+ monodll_msw_caret.o \
+ monodll_msw_clipbrd.o \
+ monodll_msw_colour.o \
+ monodll_msw_cursor.o \
+ monodll_msw_data.o \
+ monodll_msw_dc.o \
+ monodll_msw_dcclient.o \
+ monodll_msw_dcmemory.o \
+ monodll_msw_dcprint.o \
+ monodll_msw_dcscreen.o \
+ monodll_msw_dialup.o \
monodll_dib.o \
- monodll_display.o \
+ monodll_msw_display.o \
monodll_enhmeta.o \
- monodll_font.o \
- monodll_fontenum.o \
- monodll_fontutil.o \
- monodll_gdiimage.o \
- monodll_gdiobj.o \
+ monodll_msw_font.o \
+ monodll_msw_fontenum.o \
+ monodll_msw_fontutil.o \
+ monodll_msw_gdiimage.o \
+ monodll_msw_gdiobj.o \
monodll_gdiplus.o \
- monodll_graphics.o \
- monodll_icon.o \
- monodll_imaglist.o \
- monodll_minifram.o \
- monodll_dataobj.o \
+ monodll_msw_graphics.o \
+ monodll_msw_icon.o \
+ monodll_msw_imaglist.o \
+ monodll_msw_minifram.o \
+ monodll_ole_dataobj.o \
monodll_dropsrc.o \
monodll_droptgt.o \
monodll_oleutils.o \
- monodll_palette.o \
- monodll_pen.o \
- monodll_popupwin.o \
- monodll_printdlg.o \
+ monodll_msw_palette.o \
+ monodll_msw_pen.o \
+ monodll_msw_popupwin.o \
+ monodll_msw_printdlg.o \
monodll_printwin.o \
- monodll_region.o \
- monodll_renderer.o \
- monodll_settings.o \
- monodll_tooltip.o \
- monodll_toplevel.o \
- monodll_utilsgui.o \
+ monodll_msw_region.o \
+ monodll_msw_renderer.o \
+ monodll_msw_settings.o \
+ monodll_msw_tooltip.o \
+ monodll_msw_toplevel.o \
+ monodll_msw_utilsgui.o \
monodll_uxtheme.o \
- monodll_window.o
+ monodll_msw_window.o
@COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_1)
COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1 = \
- monodll_caret.o \
- monodll_imaglist.o \
- monodll_dialup.o \
- monodll_fontenum.o \
- monodll_fontutil.o \
+ monodll_generic_caret.o \
+ monodll_generic_imaglist.o \
+ monodll_unix_dialup.o \
+ monodll_unix_fontenum.o \
+ monodll_unix_fontutil.o \
monodll_utilsx11.o \
monodll_displayx11.o \
- monodll_icon.o \
- monodll_timer.o \
- monodll_app.o \
- monodll_bitmap.o \
- monodll_brush.o \
- monodll_clipbrd.o \
- monodll_colour.o \
- monodll_cursor.o \
- monodll_data.o \
- monodll_dataobj.o \
- monodll_dc.o \
- monodll_dcclient.o \
- monodll_dcmemory.o \
- monodll_dcscreen.o \
- monodll_evtloop.o \
- monodll_font.o \
- monodll_minifram.o \
+ monodll_generic_icon.o \
+ monodll_generic_timer.o \
+ monodll_x11_app.o \
+ monodll_x11_bitmap.o \
+ monodll_x11_brush.o \
+ monodll_x11_clipbrd.o \
+ monodll_x11_colour.o \
+ monodll_x11_cursor.o \
+ monodll_x11_data.o \
+ monodll_x11_dataobj.o \
+ monodll_x11_dc.o \
+ monodll_x11_dcclient.o \
+ monodll_x11_dcmemory.o \
+ monodll_x11_dcscreen.o \
+ monodll_x11_evtloop.o \
+ monodll_x11_font.o \
+ monodll_x11_minifram.o \
monodll_nanox.o \
- monodll_palette.o \
- monodll_pen.o \
- monodll_popupwin.o \
- monodll_region.o \
+ monodll_x11_palette.o \
+ monodll_x11_pen.o \
+ monodll_x11_popupwin.o \
+ monodll_x11_region.o \
monodll_reparent.o \
- monodll_settings.o \
- monodll_toplevel.o \
- monodll_utils.o \
+ monodll_x11_settings.o \
+ monodll_x11_toplevel.o \
+ monodll_x11_utils.o \
monodll_utilsx.o \
- monodll_window.o
+ monodll_x11_window.o
@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1)
COND_WXUNIV_0___ADVANCED_SRC_OBJECTS = \
monodll_animatecmn.o \
@@ -5670,35 +5728,37 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS = \
monodll_animateg.o
@COND_WXUNIV_1@__ADVANCED_SRC_OBJECTS = $(COND_WXUNIV_1___ADVANCED_SRC_OBJECTS)
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS = \
- monodll_aboutdlg.o \
+ monodll_gtk_aboutdlg.o \
monodll_animate.o \
- monodll_bmpcbox.o \
- monodll_calctrl.o \
- monodll_dataview.o \
+ monodll_gtk_bmpcbox.o \
+ monodll_gtk_calctrl.o \
+ monodll_gtk_dataview.o \
monodll_hyperlink.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS)
COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS = \
- monodll_bmpcbox.o \
- monodll_calctrl.o \
+ monodll_msw_bmpcbox.o \
+ monodll_msw_calctrl.o \
monodll_datecontrols.o \
monodll_datectrl.o
@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS)
COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS = \
- monodll_bmpcbox.o \
- monodll_calctrl.o \
+ monodll_msw_bmpcbox.o \
+ monodll_msw_calctrl.o \
monodll_datecontrols.o \
monodll_datectrl.o
@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS)
-@COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_mediactrl.o
-@COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_mediactrl.o
-@COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_mediactrl.o
+@COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS = \
+@COND_TOOLKIT_COCOA@ monodll_cocoa_mediactrl.o
+@COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_unix_mediactrl.o
+@COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_unix_mediactrl.o
COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS = \
monodll_mediactrl_am.o \
monodll_mediactrl_wmp10.o \
monodll_mediactrl_qt.o \
monodll_activex.o
@COND_TOOLKIT_MSW@__MEDIA_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS)
-@COND_TOOLKIT_OSX_CARBON@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_mediactrl.o
+@COND_TOOLKIT_OSX_CARBON@__MEDIA_PLATFORM_SRC_OBJECTS \
+@COND_TOOLKIT_OSX_CARBON@ = monodll_carbon_mediactrl.o
@COND_TOOLKIT_OSX_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS =
@COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS =
COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS = \
@@ -5707,7 +5767,7 @@ COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS = \
monodll_mediactrl_qt.o \
monodll_activex.o
@COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS)
-@COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_mediactrl.o
+@COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_unix_mediactrl.o
@COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o
@COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o
@COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS = monodll_helpbest.o
@@ -5724,13 +5784,13 @@ COND_MONOLITHIC_1_SHARED_0___monolib___depname = \
@COND_MONOLITHIC_1_SHARED_0@__install_monolib___depname = install_monolib
@COND_MONOLITHIC_1_SHARED_0@__uninstall_monolib___depname \
@COND_MONOLITHIC_1_SHARED_0@ = uninstall_monolib
-@COND_GCC_PCH_1@__monolib_PCH_INC = -I.pch/wxprec_monolib
+@COND_GCC_PCH_1@__monolib_PCH_INC = -I./.pch/wxprec_monolib
@COND_ICC_PCH_1@__monolib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_monolib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_monolib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_monolib/wx/wxprec.h.gch
+@COND_ICC_PCH_1@ ./.pch/wxprec_monolib/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_monolib_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@ = ./.pch/wxprec_monolib/wx/wxprec.h.gch
COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_1 = \
- monolib_mimetype.o \
+ monolib_core_mimetype.o \
monolib_cfstring.o \
monolib_gsockosx.o \
monolib_stdpaths_cf.o \
@@ -5741,17 +5801,17 @@ COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_1 = \
monolib_epolldispatcher.o \
monolib_appunix.o \
monolib_evtloopunix.o \
- monolib_dir.o \
+ monolib_unix_dir.o \
monolib_dlunix.o \
- monolib_snglinst.o \
- monolib_stdpaths.o \
+ monolib_unix_snglinst.o \
+ monolib_unix_stdpaths.o \
monolib_timerunx.o \
monolib_threadpsx.o \
- monolib_stackwalk.o \
+ monolib_unix_stackwalk.o \
monolib_utilsunx.o
@COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_1)
@COND_PLATFORM_MSDOS_1@__BASE_PLATFORM_SRC_OBJECTS_1 \
-@COND_PLATFORM_MSDOS_1@ = monolib_dir.o monolib_mimetype.o \
+@COND_PLATFORM_MSDOS_1@ = monolib_msdos_dir.o monolib_msdos_mimetype.o \
@COND_PLATFORM_MSDOS_1@ monolib_utilsdos.o
COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_1 = \
monolib_fdiodispatcher.o \
@@ -5760,12 +5820,12 @@ COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_1 = \
monolib_appunix.o \
monolib_evtloopunix.o \
monolib_timerunx.o \
- monolib_dir.o \
- monolib_mimetype.o \
- monolib_stdpaths.o \
- monolib_thread.o \
- monolib_utils.o \
- monolib_utilsexc.o
+ monolib_os2_dir.o \
+ monolib_os2_mimetype.o \
+ monolib_os2_stdpaths.o \
+ monolib_os2_thread.o \
+ monolib_os2_utils.o \
+ monolib_os2_utilsexc.o
@COND_PLATFORM_OS2_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_1)
COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_1 = \
monolib_fdiodispatcher.o \
@@ -5773,15 +5833,15 @@ COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_1 = \
monolib_epolldispatcher.o \
monolib_appunix.o \
monolib_evtloopunix.o \
- monolib_dir.o \
+ monolib_unix_dir.o \
monolib_dlunix.o \
- monolib_snglinst.o \
- monolib_stdpaths.o \
+ monolib_unix_snglinst.o \
+ monolib_unix_stdpaths.o \
monolib_timerunx.o \
monolib_threadpsx.o \
- monolib_stackwalk.o \
+ monolib_unix_stackwalk.o \
monolib_utilsunx.o \
- monolib_mimetype.o \
+ monolib_unix_mimetype.o \
monolib_gsocketiohandler.o
@COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_1)
COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 = \
@@ -5789,35 +5849,36 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 = \
monolib_crashrpt.o \
monolib_debughlp.o \
monolib_dde.o \
- monolib_dir.o \
+ monolib_msw_dir.o \
monolib_dlmsw.o \
- monolib_mimetype.o \
+ monolib_msw_mimetype.o \
monolib_power.o \
monolib_regconf.o \
monolib_registry.o \
- monolib_snglinst.o \
- monolib_stackwalk.o \
- monolib_stdpaths.o \
- monolib_thread.o \
- monolib_timer.o \
- monolib_utils.o \
- monolib_utilsexc.o \
+ monolib_msw_snglinst.o \
+ monolib_msw_stackwalk.o \
+ monolib_msw_stdpaths.o \
+ monolib_msw_thread.o \
+ monolib_msw_timer.o \
+ monolib_msw_utils.o \
+ monolib_msw_utilsexc.o \
$(__BASE_WINCE_SRC_OBJECTS_1)
@COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1)
@COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS_1 = monolib_time.o
@COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 =
@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 \
-@COND_PLATFORM_WIN32_1@ = monolib_evtloop.o monolib_main.o monolib_mslu.o \
-@COND_PLATFORM_WIN32_1@ monolib_volume.o
+@COND_PLATFORM_WIN32_1@ = monolib_msw_evtloop.o monolib_msw_main.o \
+@COND_PLATFORM_WIN32_1@ monolib_mslu.o monolib_volume.o
@COND_TOOLKIT_OSX_CARBON@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_1 \
-@COND_TOOLKIT_OSX_CARBON@ = monolib_utils.o monolib_uma.o
+@COND_TOOLKIT_OSX_CARBON@ = monolib_carbon_utils.o monolib_uma.o
@COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_1 \
-@COND_TOOLKIT_OSX_COCOA@ = monolib_utils.o
-@COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_gsocket.o
-@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_gsocket.o
-@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_gsocket.o
+@COND_TOOLKIT_OSX_COCOA@ = monolib_osx_cocoa_utils.o
+@COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_1 \
+@COND_PLATFORM_MACOSX_1@ = monolib_unix_gsocket.o
+@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_unix_gsocket.o
+@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_unix_gsocket.o
COND_PLATFORM_WIN32_1___NET_PLATFORM_SRC_OBJECTS_1 = \
- monolib_gsocket.o \
+ monolib_msw_gsocket.o \
monolib_gsockmsw.o \
monolib_urlmsw.o \
$(__NET_WINCE_SRC_OBJECTS_1)
@@ -6074,55 +6135,55 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \
COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \
$(__LOWLEVEL_SRC_OBJECTS_3) \
$(__PLATFORM_SRC_OBJECTS_0) \
- monolib_accel.o \
+ monolib_generic_accel.o \
monolib_clrpickerg.o \
monolib_collpaneg.o \
monolib_colrdlgg.o \
monolib_dirdlgg.o \
- monolib_fdrepdlg.o \
+ monolib_generic_fdrepdlg.o \
monolib_filedlgg.o \
monolib_filepickerg.o \
monolib_fontdlgg.o \
monolib_fontpickerg.o \
- monolib_listctrl.o \
+ monolib_generic_listctrl.o \
monolib_mdig.o \
monolib_msgdlgg.o \
monolib_prntdlgg.o \
monolib_tabg.o \
- monolib_bmpbuttn.o \
- monolib_button.o \
- monolib_checkbox.o \
- monolib_checklst.o \
- monolib_choice.o \
- monolib_combobox.o \
- monolib_control.o \
+ monolib_univ_bmpbuttn.o \
+ monolib_univ_button.o \
+ monolib_univ_checkbox.o \
+ monolib_univ_checklst.o \
+ monolib_univ_choice.o \
+ monolib_univ_combobox.o \
+ monolib_univ_control.o \
monolib_ctrlrend.o \
- monolib_dialog.o \
+ monolib_univ_dialog.o \
monolib_framuniv.o \
- monolib_gauge.o \
+ monolib_univ_gauge.o \
monolib_inpcons.o \
monolib_inphand.o \
- monolib_listbox.o \
- monolib_menu.o \
- monolib_notebook.o \
- monolib_radiobox.o \
- monolib_radiobut.o \
+ monolib_univ_listbox.o \
+ monolib_univ_menu.o \
+ monolib_univ_notebook.o \
+ monolib_univ_radiobox.o \
+ monolib_univ_radiobut.o \
monolib_scrarrow.o \
- monolib_scrolbar.o \
+ monolib_univ_scrolbar.o \
monolib_scrthumb.o \
monolib_settingsuniv.o \
- monolib_slider.o \
- monolib_spinbutt.o \
- monolib_statbmp.o \
- monolib_statbox.o \
- monolib_statline.o \
- monolib_stattext.o \
- monolib_statusbr.o \
+ monolib_univ_slider.o \
+ monolib_univ_spinbutt.o \
+ monolib_univ_statbmp.o \
+ monolib_univ_statbox.o \
+ monolib_univ_statline.o \
+ monolib_univ_stattext.o \
+ monolib_univ_statusbr.o \
monolib_stdrend.o \
- monolib_textctrl.o \
- monolib_tglbtn.o \
+ monolib_univ_textctrl.o \
+ monolib_univ_tglbtn.o \
monolib_theme.o \
- monolib_toolbar.o \
+ monolib_univ_toolbar.o \
monolib_topluniv.o \
monolib_winuniv.o \
monolib_gtk.o \
@@ -6261,209 +6322,209 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \
@COND_TOOLKIT_COCOA@ monolib_hid.o monolib_utilsexc_cf.o
COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_2 = \
monolib_fontmgrcmn.o \
- monolib_caret.o \
- monolib_colour.o \
- monolib_icon.o \
- monolib_imaglist.o \
+ monolib_generic_caret.o \
+ monolib_generic_colour.o \
+ monolib_generic_icon.o \
+ monolib_generic_imaglist.o \
monolib_mask.o \
- monolib_timer.o \
- monolib_app.o \
- monolib_bitmap.o \
- monolib_brush.o \
- monolib_cursor.o \
- monolib_dc.o \
- monolib_dcclient.o \
- monolib_dcmemory.o \
- monolib_dcscreen.o \
- monolib_evtloop.o \
- monolib_font.o \
- monolib_fontenum.o \
- monolib_fontmgr.o \
- monolib_nonownedwnd.o \
- monolib_overlay.o \
- monolib_pen.o \
- monolib_region.o \
- monolib_settings.o \
- monolib_toplevel.o \
- monolib_utils.o \
- monolib_window.o \
+ monolib_generic_timer.o \
+ monolib_dfb_app.o \
+ monolib_dfb_bitmap.o \
+ monolib_dfb_brush.o \
+ monolib_dfb_cursor.o \
+ monolib_dfb_dc.o \
+ monolib_dfb_dcclient.o \
+ monolib_dfb_dcmemory.o \
+ monolib_dfb_dcscreen.o \
+ monolib_dfb_evtloop.o \
+ monolib_dfb_font.o \
+ monolib_dfb_fontenum.o \
+ monolib_dfb_fontmgr.o \
+ monolib_dfb_nonownedwnd.o \
+ monolib_dfb_overlay.o \
+ monolib_dfb_pen.o \
+ monolib_dfb_region.o \
+ monolib_dfb_settings.o \
+ monolib_dfb_toplevel.o \
+ monolib_dfb_utils.o \
+ monolib_dfb_window.o \
monolib_wrapdfb.o
@COND_TOOLKIT_DFB@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_2)
COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_2 = \
- monolib_caret.o \
- monolib_imaglist.o \
- monolib_dialup.o \
- monolib_fontenum.o \
- monolib_fontutil.o \
+ monolib_generic_caret.o \
+ monolib_generic_imaglist.o \
+ monolib_unix_dialup.o \
+ monolib_unix_fontenum.o \
+ monolib_unix_fontutil.o \
monolib_utilsx11.o \
monolib_displayx11.o \
- monolib_icon.o \
+ monolib_generic_icon.o \
monolib_paletteg.o \
- monolib_app.o \
- monolib_bitmap.o \
- monolib_brush.o \
- monolib_clipbrd.o \
- monolib_colour.o \
- monolib_cursor.o \
- monolib_data.o \
- monolib_dataobj.o \
- monolib_dc.o \
- monolib_dcclient.o \
- monolib_dcmemory.o \
- monolib_dcscreen.o \
- monolib_dnd.o \
- monolib_evtloop.o \
- monolib_font.o \
- monolib_gsockgtk.o \
- monolib_main.o \
- monolib_minifram.o \
- monolib_pen.o \
- monolib_popupwin.o \
- monolib_region.o \
- monolib_renderer.o \
- monolib_settings.o \
- monolib_timer.o \
- monolib_tooltip.o \
- monolib_toplevel.o \
- monolib_utilsgtk.o \
- monolib_win_gtk.o \
- monolib_window.o
+ monolib_gtk1_app.o \
+ monolib_gtk1_bitmap.o \
+ monolib_gtk1_brush.o \
+ monolib_gtk1_clipbrd.o \
+ monolib_gtk1_colour.o \
+ monolib_gtk1_cursor.o \
+ monolib_gtk1_data.o \
+ monolib_gtk1_dataobj.o \
+ monolib_gtk1_dc.o \
+ monolib_gtk1_dcclient.o \
+ monolib_gtk1_dcmemory.o \
+ monolib_gtk1_dcscreen.o \
+ monolib_gtk1_dnd.o \
+ monolib_gtk1_evtloop.o \
+ monolib_gtk1_font.o \
+ monolib_gtk1_gsockgtk.o \
+ monolib_gtk1_main.o \
+ monolib_gtk1_minifram.o \
+ monolib_gtk1_pen.o \
+ monolib_gtk1_popupwin.o \
+ monolib_gtk1_region.o \
+ monolib_gtk1_renderer.o \
+ monolib_gtk1_settings.o \
+ monolib_gtk1_timer.o \
+ monolib_gtk1_tooltip.o \
+ monolib_gtk1_toplevel.o \
+ monolib_gtk1_utilsgtk.o \
+ monolib_gtk1_win_gtk.o \
+ monolib_gtk1_window.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_2)
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_2 = \
- monolib_caret.o \
- monolib_imaglist.o \
- monolib_dialup.o \
- monolib_fontenum.o \
- monolib_fontutil.o \
+ monolib_generic_caret.o \
+ monolib_generic_imaglist.o \
+ monolib_unix_dialup.o \
+ monolib_unix_fontenum.o \
+ monolib_unix_fontutil.o \
monolib_utilsx11.o \
monolib_displayx11.o \
- monolib_icon.o \
+ monolib_generic_icon.o \
monolib_paletteg.o \
- monolib_app.o \
+ monolib_gtk_app.o \
monolib_assertdlg_gtk.o \
- monolib_bitmap.o \
- monolib_brush.o \
- monolib_clipbrd.o \
- monolib_colour.o \
- monolib_cursor.o \
- monolib_dataobj.o \
- monolib_dc.o \
- monolib_dcclient.o \
- monolib_dcmemory.o \
- monolib_dcscreen.o \
- monolib_dnd.o \
- monolib_evtloop.o \
+ monolib_gtk_bitmap.o \
+ monolib_gtk_brush.o \
+ monolib_gtk_clipbrd.o \
+ monolib_gtk_colour.o \
+ monolib_gtk_cursor.o \
+ monolib_gtk_dataobj.o \
+ monolib_gtk_dc.o \
+ monolib_gtk_dcclient.o \
+ monolib_gtk_dcmemory.o \
+ monolib_gtk_dcscreen.o \
+ monolib_gtk_dnd.o \
+ monolib_gtk_evtloop.o \
monolib_filectrl.o \
- monolib_font.o \
- monolib_gsockgtk.o \
- monolib_minifram.o \
- monolib_pen.o \
- monolib_popupwin.o \
+ monolib_gtk_font.o \
+ monolib_gtk_gsockgtk.o \
+ monolib_gtk_minifram.o \
+ monolib_gtk_pen.o \
+ monolib_gtk_popupwin.o \
monolib_private.o \
- monolib_region.o \
- monolib_renderer.o \
- monolib_settings.o \
- monolib_timer.o \
- monolib_tooltip.o \
- monolib_toplevel.o \
- monolib_utilsgtk.o \
- monolib_win_gtk.o \
- monolib_window.o
+ monolib_gtk_region.o \
+ monolib_gtk_renderer.o \
+ monolib_gtk_settings.o \
+ monolib_gtk_timer.o \
+ monolib_gtk_tooltip.o \
+ monolib_gtk_toplevel.o \
+ monolib_gtk_utilsgtk.o \
+ monolib_gtk_win_gtk.o \
+ monolib_gtk_window.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_2)
COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_2 = \
monolib_fontmgrcmn.o \
- monolib_caret.o \
- monolib_colour.o \
- monolib_icon.o \
- monolib_imaglist.o \
+ monolib_generic_caret.o \
+ monolib_generic_colour.o \
+ monolib_generic_icon.o \
+ monolib_generic_imaglist.o \
monolib_mask.o \
- monolib_timer.o \
- monolib_app.o \
- monolib_bitmap.o \
- monolib_brush.o \
- monolib_clipbrd.o \
- monolib_cursor.o \
- monolib_data.o \
- monolib_dc.o \
- monolib_dcclient.o \
- monolib_dcmemory.o \
- monolib_dcscreen.o \
+ monolib_generic_timer.o \
+ monolib_mgl_app.o \
+ monolib_mgl_bitmap.o \
+ monolib_mgl_brush.o \
+ monolib_mgl_clipbrd.o \
+ monolib_mgl_cursor.o \
+ monolib_mgl_data.o \
+ monolib_mgl_dc.o \
+ monolib_mgl_dcclient.o \
+ monolib_mgl_dcmemory.o \
+ monolib_mgl_dcscreen.o \
monolib_dirmgl.o \
- monolib_evtloop.o \
- monolib_font.o \
- monolib_fontenum.o \
- monolib_fontmgr.o \
- monolib_fontutil.o \
- monolib_palette.o \
- monolib_pen.o \
- monolib_region.o \
- monolib_settings.o \
- monolib_toplevel.o \
- monolib_utils.o \
- monolib_window.o
+ monolib_mgl_evtloop.o \
+ monolib_mgl_font.o \
+ monolib_mgl_fontenum.o \
+ monolib_mgl_fontmgr.o \
+ monolib_mgl_fontutil.o \
+ monolib_mgl_palette.o \
+ monolib_mgl_pen.o \
+ monolib_mgl_region.o \
+ monolib_mgl_settings.o \
+ monolib_mgl_toplevel.o \
+ monolib_mgl_utils.o \
+ monolib_mgl_window.o
@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_2)
COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_2 = \
- monolib_caret.o \
- monolib_imaglist.o \
- monolib_dialup.o \
- monolib_fontenum.o \
- monolib_fontutil.o \
+ monolib_generic_caret.o \
+ monolib_generic_imaglist.o \
+ monolib_unix_dialup.o \
+ monolib_unix_fontenum.o \
+ monolib_unix_fontutil.o \
monolib_utilsx11.o \
monolib_displayx11.o \
- monolib_bitmap.o \
- monolib_brush.o \
- monolib_palette.o \
- monolib_pen.o \
- monolib_region.o \
+ monolib_x11_bitmap.o \
+ monolib_x11_brush.o \
+ monolib_x11_palette.o \
+ monolib_x11_pen.o \
+ monolib_x11_region.o \
monolib_utilsx.o
@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_2)
COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 = \
- monolib_app.o \
- monolib_bitmap.o \
- monolib_brush.o \
- monolib_caret.o \
- monolib_clipbrd.o \
- monolib_colour.o \
- monolib_cursor.o \
- monolib_data.o \
- monolib_dc.o \
- monolib_dcclient.o \
- monolib_dcmemory.o \
- monolib_dcprint.o \
- monolib_dcscreen.o \
- monolib_dialup.o \
+ monolib_msw_app.o \
+ monolib_msw_bitmap.o \
+ monolib_msw_brush.o \
+ monolib_msw_caret.o \
+ monolib_msw_clipbrd.o \
+ monolib_msw_colour.o \
+ monolib_msw_cursor.o \
+ monolib_msw_data.o \
+ monolib_msw_dc.o \
+ monolib_msw_dcclient.o \
+ monolib_msw_dcmemory.o \
+ monolib_msw_dcprint.o \
+ monolib_msw_dcscreen.o \
+ monolib_msw_dialup.o \
monolib_dib.o \
- monolib_display.o \
+ monolib_msw_display.o \
monolib_enhmeta.o \
- monolib_font.o \
- monolib_fontenum.o \
- monolib_fontutil.o \
- monolib_gdiimage.o \
- monolib_gdiobj.o \
+ monolib_msw_font.o \
+ monolib_msw_fontenum.o \
+ monolib_msw_fontutil.o \
+ monolib_msw_gdiimage.o \
+ monolib_msw_gdiobj.o \
monolib_gdiplus.o \
- monolib_graphics.o \
- monolib_icon.o \
- monolib_imaglist.o \
- monolib_minifram.o \
- monolib_dataobj.o \
+ monolib_msw_graphics.o \
+ monolib_msw_icon.o \
+ monolib_msw_imaglist.o \
+ monolib_msw_minifram.o \
+ monolib_ole_dataobj.o \
monolib_dropsrc.o \
monolib_droptgt.o \
monolib_oleutils.o \
- monolib_palette.o \
- monolib_pen.o \
- monolib_popupwin.o \
- monolib_printdlg.o \
+ monolib_msw_palette.o \
+ monolib_msw_pen.o \
+ monolib_msw_popupwin.o \
+ monolib_msw_printdlg.o \
monolib_printwin.o \
- monolib_region.o \
- monolib_renderer.o \
- monolib_settings.o \
- monolib_tooltip.o \
- monolib_toplevel.o \
- monolib_utilsgui.o \
+ monolib_msw_region.o \
+ monolib_msw_renderer.o \
+ monolib_msw_settings.o \
+ monolib_msw_tooltip.o \
+ monolib_msw_toplevel.o \
+ monolib_msw_utilsgui.o \
monolib_uxtheme.o \
- monolib_window.o \
+ monolib_msw_window.o \
monolib_helpchm.o \
- monolib_helpwin.o \
+ monolib_msw_helpwin.o \
monolib_automtn.o \
monolib_uuid.o
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2)
@@ -6473,87 +6534,87 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 = \
@COND_TOOLKIT_OSX_COCOA@ $(__OSX_LOWLEVEL_SRC_OBJECTS_17)
@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_2 =
COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_2 = \
- monolib_app.o \
- monolib_bitmap.o \
- monolib_brush.o \
- monolib_caret.o \
- monolib_clipbrd.o \
- monolib_colour.o \
- monolib_cursor.o \
- monolib_data.o \
- monolib_dc.o \
- monolib_dcclient.o \
- monolib_dcmemory.o \
- monolib_dcprint.o \
- monolib_dcscreen.o \
- monolib_dialup.o \
+ monolib_msw_app.o \
+ monolib_msw_bitmap.o \
+ monolib_msw_brush.o \
+ monolib_msw_caret.o \
+ monolib_msw_clipbrd.o \
+ monolib_msw_colour.o \
+ monolib_msw_cursor.o \
+ monolib_msw_data.o \
+ monolib_msw_dc.o \
+ monolib_msw_dcclient.o \
+ monolib_msw_dcmemory.o \
+ monolib_msw_dcprint.o \
+ monolib_msw_dcscreen.o \
+ monolib_msw_dialup.o \
monolib_dib.o \
- monolib_display.o \
+ monolib_msw_display.o \
monolib_enhmeta.o \
- monolib_font.o \
- monolib_fontenum.o \
- monolib_fontutil.o \
- monolib_gdiimage.o \
- monolib_gdiobj.o \
+ monolib_msw_font.o \
+ monolib_msw_fontenum.o \
+ monolib_msw_fontutil.o \
+ monolib_msw_gdiimage.o \
+ monolib_msw_gdiobj.o \
monolib_gdiplus.o \
- monolib_graphics.o \
- monolib_icon.o \
- monolib_imaglist.o \
- monolib_minifram.o \
- monolib_dataobj.o \
+ monolib_msw_graphics.o \
+ monolib_msw_icon.o \
+ monolib_msw_imaglist.o \
+ monolib_msw_minifram.o \
+ monolib_ole_dataobj.o \
monolib_dropsrc.o \
monolib_droptgt.o \
monolib_oleutils.o \
- monolib_palette.o \
- monolib_pen.o \
- monolib_popupwin.o \
- monolib_printdlg.o \
+ monolib_msw_palette.o \
+ monolib_msw_pen.o \
+ monolib_msw_popupwin.o \
+ monolib_msw_printdlg.o \
monolib_printwin.o \
- monolib_region.o \
- monolib_renderer.o \
- monolib_settings.o \
- monolib_tooltip.o \
- monolib_toplevel.o \
- monolib_utilsgui.o \
+ monolib_msw_region.o \
+ monolib_msw_renderer.o \
+ monolib_msw_settings.o \
+ monolib_msw_tooltip.o \
+ monolib_msw_toplevel.o \
+ monolib_msw_utilsgui.o \
monolib_uxtheme.o \
- monolib_window.o
+ monolib_msw_window.o
@COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_2)
COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_2 = \
- monolib_caret.o \
- monolib_imaglist.o \
- monolib_dialup.o \
- monolib_fontenum.o \
- monolib_fontutil.o \
+ monolib_generic_caret.o \
+ monolib_generic_imaglist.o \
+ monolib_unix_dialup.o \
+ monolib_unix_fontenum.o \
+ monolib_unix_fontutil.o \
monolib_utilsx11.o \
monolib_displayx11.o \
- monolib_icon.o \
- monolib_timer.o \
- monolib_app.o \
- monolib_bitmap.o \
- monolib_brush.o \
- monolib_clipbrd.o \
- monolib_colour.o \
- monolib_cursor.o \
- monolib_data.o \
- monolib_dataobj.o \
- monolib_dc.o \
- monolib_dcclient.o \
- monolib_dcmemory.o \
- monolib_dcscreen.o \
- monolib_evtloop.o \
- monolib_font.o \
- monolib_minifram.o \
+ monolib_generic_icon.o \
+ monolib_generic_timer.o \
+ monolib_x11_app.o \
+ monolib_x11_bitmap.o \
+ monolib_x11_brush.o \
+ monolib_x11_clipbrd.o \
+ monolib_x11_colour.o \
+ monolib_x11_cursor.o \
+ monolib_x11_data.o \
+ monolib_x11_dataobj.o \
+ monolib_x11_dc.o \
+ monolib_x11_dcclient.o \
+ monolib_x11_dcmemory.o \
+ monolib_x11_dcscreen.o \
+ monolib_x11_evtloop.o \
+ monolib_x11_font.o \
+ monolib_x11_minifram.o \
monolib_nanox.o \
- monolib_palette.o \
- monolib_pen.o \
- monolib_popupwin.o \
- monolib_region.o \
+ monolib_x11_palette.o \
+ monolib_x11_pen.o \
+ monolib_x11_popupwin.o \
+ monolib_x11_region.o \
monolib_reparent.o \
- monolib_settings.o \
- monolib_toplevel.o \
- monolib_utils.o \
+ monolib_x11_settings.o \
+ monolib_x11_toplevel.o \
+ monolib_x11_utils.o \
monolib_utilsx.o \
- monolib_window.o
+ monolib_x11_window.o
@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_2)
COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 = \
monolib_NSBox.o \
@@ -6569,256 +6630,256 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 = \
monolib_NSView.o \
monolib_NSWindow.o \
monolib_ObjcRef.o \
- monolib_app.o \
- monolib_bitmap.o \
- monolib_bmpbuttn.o \
- monolib_brush.o \
- monolib_button.o \
- monolib_checkbox.o \
- monolib_checklst.o \
- monolib_choice.o \
- monolib_clipbrd.o \
- monolib_colordlg.o \
- monolib_colour.o \
- monolib_combobox.o \
- monolib_control.o \
- monolib_cursor.o \
- monolib_data.o \
- monolib_dataobj.o \
- monolib_dc.o \
- monolib_dcclient.o \
- monolib_dcmemory.o \
- monolib_dcscreen.o \
- monolib_dialog.o \
- monolib_dirdlg.o \
- monolib_display.o \
- monolib_drawer.o \
- monolib_evtloop.o \
- monolib_filedlg.o \
- monolib_font.o \
- monolib_fontdlg.o \
- monolib_fontenum.o \
- monolib_fontutil.o \
- monolib_frame.o \
- monolib_gauge.o \
- monolib_icon.o \
- monolib_listbox.o \
- monolib_main.o \
+ monolib_cocoa_app.o \
+ monolib_cocoa_bitmap.o \
+ monolib_src_cocoa_bmpbuttn.o \
+ monolib_cocoa_brush.o \
+ monolib_src_cocoa_button.o \
+ monolib_src_cocoa_checkbox.o \
+ monolib_cocoa_checklst.o \
+ monolib_src_cocoa_choice.o \
+ monolib_cocoa_clipbrd.o \
+ monolib_cocoa_colordlg.o \
+ monolib_cocoa_colour.o \
+ monolib_cocoa_combobox.o \
+ monolib_cocoa_control.o \
+ monolib_cocoa_cursor.o \
+ monolib_cocoa_data.o \
+ monolib_cocoa_dataobj.o \
+ monolib_cocoa_dc.o \
+ monolib_cocoa_dcclient.o \
+ monolib_cocoa_dcmemory.o \
+ monolib_cocoa_dcscreen.o \
+ monolib_src_cocoa_dialog.o \
+ monolib_src_cocoa_dirdlg.o \
+ monolib_cocoa_display.o \
+ monolib_cocoa_drawer.o \
+ monolib_src_cocoa_evtloop.o \
+ monolib_src_cocoa_filedlg.o \
+ monolib_cocoa_font.o \
+ monolib_cocoa_fontdlg.o \
+ monolib_cocoa_fontenum.o \
+ monolib_cocoa_fontutil.o \
+ monolib_cocoa_frame.o \
+ monolib_src_cocoa_gauge.o \
+ monolib_cocoa_icon.o \
+ monolib_src_cocoa_listbox.o \
+ monolib_cocoa_main.o \
monolib_mbarman.o \
- monolib_mdi.o \
- monolib_menu.o \
- monolib_menuitem.o \
- monolib_msgdlg.o \
- monolib_notebook.o \
- monolib_pen.o \
- monolib_radiobox.o \
- monolib_radiobut.o \
- monolib_region.o \
- monolib_scrolbar.o \
- monolib_settings.o \
- monolib_slider.o \
- monolib_sound.o \
- monolib_spinbutt.o \
- monolib_statbmp.o \
- monolib_statbox.o \
+ monolib_cocoa_mdi.o \
+ monolib_src_cocoa_menu.o \
+ monolib_src_cocoa_menuitem.o \
+ monolib_src_cocoa_msgdlg.o \
+ monolib_src_cocoa_notebook.o \
+ monolib_cocoa_pen.o \
+ monolib_cocoa_radiobox.o \
+ monolib_src_cocoa_radiobut.o \
+ monolib_cocoa_region.o \
+ monolib_src_cocoa_scrolbar.o \
+ monolib_cocoa_settings.o \
+ monolib_src_cocoa_slider.o \
+ monolib_cocoa_sound.o \
+ monolib_src_cocoa_spinbutt.o \
+ monolib_cocoa_statbmp.o \
+ monolib_src_cocoa_statbox.o \
monolib_statline2.o \
- monolib_stattext.o \
- monolib_textctrl.o \
- monolib_timer.o \
- monolib_toolbar.o \
- monolib_tooltip.o \
- monolib_toplevel.o \
- monolib_utils.o \
- monolib_utilsexc.o \
- monolib_window.o \
- monolib_accel.o \
- monolib_caret.o \
+ monolib_src_cocoa_stattext.o \
+ monolib_src_cocoa_textctrl.o \
+ monolib_cocoa_timer.o \
+ monolib_src_cocoa_toolbar.o \
+ monolib_src_cocoa_tooltip.o \
+ monolib_cocoa_toplevel.o \
+ monolib_src_cocoa_utils.o \
+ monolib_cocoa_utilsexc.o \
+ monolib_src_cocoa_window.o \
+ monolib_generic_accel.o \
+ monolib_generic_caret.o \
monolib_clrpickerg.o \
monolib_collpaneg.o \
monolib_colrdlgg.o \
- monolib_fdrepdlg.o \
+ monolib_generic_fdrepdlg.o \
monolib_filepickerg.o \
monolib_fontdlgg.o \
monolib_fontpickerg.o \
- monolib_imaglist.o \
- monolib_listctrl.o \
+ monolib_generic_imaglist.o \
+ monolib_generic_listctrl.o \
monolib_msgdlgg.o \
monolib_paletteg.o \
monolib_regiong.o \
- monolib_statusbr.o \
+ monolib_generic_statusbr.o \
monolib_tabg.o
@COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1)
COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_1 = \
- monolib_accel.o \
+ monolib_generic_accel.o \
monolib_clrpickerg.o \
monolib_collpaneg.o \
monolib_colrdlgg.o \
monolib_dirdlgg.o \
- monolib_fdrepdlg.o \
+ monolib_generic_fdrepdlg.o \
monolib_filedlgg.o \
monolib_filepickerg.o \
monolib_fontdlgg.o \
monolib_fontpickerg.o \
- monolib_listctrl.o \
+ monolib_generic_listctrl.o \
monolib_msgdlgg.o \
monolib_prntdlgg.o \
- monolib_statusbr.o \
+ monolib_generic_statusbr.o \
monolib_tabg.o \
- monolib_bmpbuttn.o \
- monolib_button.o \
- monolib_checkbox.o \
- monolib_checklst.o \
- monolib_choice.o \
- monolib_combobox.o \
- monolib_control.o \
- monolib_dialog.o \
- monolib_filedlg.o \
- monolib_fontdlg.o \
- monolib_frame.o \
- monolib_gauge.o \
- monolib_listbox.o \
- monolib_mdi.o \
- monolib_menu.o \
- monolib_notebook.o \
- monolib_radiobox.o \
- monolib_radiobut.o \
- monolib_scrolbar.o \
- monolib_scrolwin.o \
- monolib_slider.o \
- monolib_spinbutt.o \
- monolib_spinctrl.o \
- monolib_statbmp.o \
- monolib_statbox.o \
- monolib_statline.o \
- monolib_stattext.o \
- monolib_tbargtk.o \
- monolib_textctrl.o \
- monolib_tglbtn.o
+ monolib_gtk1_bmpbuttn.o \
+ monolib_gtk1_button.o \
+ monolib_gtk1_checkbox.o \
+ monolib_gtk1_checklst.o \
+ monolib_gtk1_choice.o \
+ monolib_gtk1_combobox.o \
+ monolib_gtk1_control.o \
+ monolib_gtk1_dialog.o \
+ monolib_gtk1_filedlg.o \
+ monolib_gtk1_fontdlg.o \
+ monolib_gtk1_frame.o \
+ monolib_gtk1_gauge.o \
+ monolib_gtk1_listbox.o \
+ monolib_gtk1_mdi.o \
+ monolib_gtk1_menu.o \
+ monolib_gtk1_notebook.o \
+ monolib_gtk1_radiobox.o \
+ monolib_gtk1_radiobut.o \
+ monolib_gtk1_scrolbar.o \
+ monolib_gtk1_scrolwin.o \
+ monolib_gtk1_slider.o \
+ monolib_gtk1_spinbutt.o \
+ monolib_gtk1_spinctrl.o \
+ monolib_gtk1_statbmp.o \
+ monolib_gtk1_statbox.o \
+ monolib_gtk1_statline.o \
+ monolib_gtk1_stattext.o \
+ monolib_gtk1_tbargtk.o \
+ monolib_gtk1_textctrl.o \
+ monolib_gtk1_tglbtn.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_1)
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_1 = \
- monolib_accel.o \
- monolib_fdrepdlg.o \
+ monolib_generic_accel.o \
+ monolib_generic_fdrepdlg.o \
monolib_filepickerg.o \
monolib_graphicc.o \
- monolib_listctrl.o \
+ monolib_generic_listctrl.o \
monolib_prntdlgg.o \
- monolib_statusbr.o \
+ monolib_generic_statusbr.o \
monolib_tabg.o \
monolib_fontdlgg.o \
monolib_msgdlgg.o \
monolib_artgtk.o \
- monolib_bmpbuttn.o \
- monolib_button.o \
- monolib_checkbox.o \
- monolib_checklst.o \
- monolib_choice.o \
+ monolib_gtk_bmpbuttn.o \
+ monolib_gtk_button.o \
+ monolib_gtk_checkbox.o \
+ monolib_gtk_checklst.o \
+ monolib_gtk_choice.o \
monolib_collpane.o \
- monolib_colordlg.o \
- monolib_combobox.o \
- monolib_control.o \
+ monolib_gtk_colordlg.o \
+ monolib_gtk_combobox.o \
+ monolib_gtk_control.o \
monolib_clrpicker.o \
- monolib_dialog.o \
+ monolib_gtk_dialog.o \
monolib_fontpicker.o \
monolib_filepicker.o \
- monolib_dirdlg.o \
- monolib_filedlg.o \
- monolib_fontdlg.o \
- monolib_frame.o \
- monolib_gauge.o \
+ monolib_gtk_dirdlg.o \
+ monolib_gtk_filedlg.o \
+ monolib_gtk_fontdlg.o \
+ monolib_gtk_frame.o \
+ monolib_gtk_gauge.o \
monolib_gprint.o \
monolib_gvfs.o \
- monolib_print.o \
- monolib_listbox.o \
- monolib_mdi.o \
- monolib_menu.o \
+ monolib_gtk_print.o \
+ monolib_gtk_listbox.o \
+ monolib_gtk_mdi.o \
+ monolib_gtk_menu.o \
monolib_mnemonics.o \
- monolib_msgdlg.o \
- monolib_nativewin.o \
- monolib_notebook.o \
- monolib_radiobox.o \
- monolib_radiobut.o \
- monolib_scrolbar.o \
- monolib_scrolwin.o \
- monolib_slider.o \
- monolib_spinbutt.o \
- monolib_spinctrl.o \
- monolib_statbmp.o \
- monolib_statbox.o \
- monolib_statline.o \
- monolib_stattext.o \
- monolib_tbargtk.o \
- monolib_textctrl.o \
- monolib_textentry.o \
- monolib_tglbtn.o \
+ monolib_gtk_msgdlg.o \
+ monolib_gtk_nativewin.o \
+ monolib_gtk_notebook.o \
+ monolib_gtk_radiobox.o \
+ monolib_gtk_radiobut.o \
+ monolib_gtk_scrolbar.o \
+ monolib_gtk_scrolwin.o \
+ monolib_gtk_slider.o \
+ monolib_gtk_spinbutt.o \
+ monolib_gtk_spinctrl.o \
+ monolib_gtk_statbmp.o \
+ monolib_gtk_statbox.o \
+ monolib_gtk_statline.o \
+ monolib_gtk_stattext.o \
+ monolib_gtk_tbargtk.o \
+ monolib_gtk_textctrl.o \
+ monolib_gtk_textentry.o \
+ monolib_gtk_tglbtn.o \
monolib_treeentry_gtk.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_1)
COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1 = \
- monolib_accel.o \
- monolib_app.o \
- monolib_bmpbuttn.o \
+ monolib_motif_accel.o \
+ monolib_motif_app.o \
+ monolib_motif_bmpbuttn.o \
monolib_bmpmotif.o \
- monolib_button.o \
- monolib_checkbox.o \
- monolib_checklst.o \
- monolib_choice.o \
- monolib_clipbrd.o \
- monolib_colour.o \
- monolib_combobox.o \
+ monolib_motif_button.o \
+ monolib_motif_checkbox.o \
+ monolib_motif_checklst.o \
+ monolib_motif_choice.o \
+ monolib_motif_clipbrd.o \
+ monolib_motif_colour.o \
+ monolib_motif_combobox.o \
monolib_combobox_native.o \
- monolib_control.o \
- monolib_cursor.o \
- monolib_data.o \
- monolib_dataobj.o \
- monolib_dc.o \
- monolib_dcclient.o \
- monolib_dcmemory.o \
- monolib_dcscreen.o \
- monolib_dialog.o \
- monolib_evtloop.o \
- monolib_filedlg.o \
- monolib_font.o \
- monolib_frame.o \
- monolib_gauge.o \
+ monolib_motif_control.o \
+ monolib_motif_cursor.o \
+ monolib_motif_data.o \
+ monolib_motif_dataobj.o \
+ monolib_motif_dc.o \
+ monolib_motif_dcclient.o \
+ monolib_motif_dcmemory.o \
+ monolib_motif_dcscreen.o \
+ monolib_motif_dialog.o \
+ monolib_motif_evtloop.o \
+ monolib_motif_filedlg.o \
+ monolib_motif_font.o \
+ monolib_motif_frame.o \
+ monolib_motif_gauge.o \
monolib_gsockmot.o \
- monolib_icon.o \
- monolib_listbox.o \
- monolib_main.o \
- monolib_mdi.o \
- monolib_menu.o \
- monolib_menuitem.o \
- monolib_minifram.o \
- monolib_msgdlg.o \
- monolib_popupwin.o \
- monolib_radiobox.o \
- monolib_radiobut.o \
- monolib_scrolbar.o \
- monolib_settings.o \
- monolib_slider.o \
- monolib_spinbutt.o \
- monolib_statbmp.o \
- monolib_statbox.o \
- monolib_stattext.o \
- monolib_textctrl.o \
- monolib_textentry.o \
- monolib_timer.o \
- monolib_toolbar.o \
- monolib_toplevel.o \
- monolib_utils.o \
- monolib_window.o \
+ monolib_motif_icon.o \
+ monolib_motif_listbox.o \
+ monolib_motif_main.o \
+ monolib_motif_mdi.o \
+ monolib_motif_menu.o \
+ monolib_motif_menuitem.o \
+ monolib_motif_minifram.o \
+ monolib_motif_msgdlg.o \
+ monolib_motif_popupwin.o \
+ monolib_motif_radiobox.o \
+ monolib_motif_radiobut.o \
+ monolib_motif_scrolbar.o \
+ monolib_motif_settings.o \
+ monolib_motif_slider.o \
+ monolib_motif_spinbutt.o \
+ monolib_motif_statbmp.o \
+ monolib_motif_statbox.o \
+ monolib_motif_stattext.o \
+ monolib_motif_textctrl.o \
+ monolib_motif_textentry.o \
+ monolib_motif_timer.o \
+ monolib_motif_toolbar.o \
+ monolib_motif_toplevel.o \
+ monolib_motif_utils.o \
+ monolib_motif_window.o \
monolib_xmcombo.o \
monolib_clrpickerg.o \
monolib_collpaneg.o \
monolib_colrdlgg.o \
monolib_dirdlgg.o \
- monolib_fdrepdlg.o \
+ monolib_generic_fdrepdlg.o \
monolib_filepickerg.o \
monolib_fontdlgg.o \
monolib_fontpickerg.o \
- monolib_listctrl.o \
- monolib_notebook.o \
+ monolib_generic_listctrl.o \
+ monolib_generic_notebook.o \
monolib_prntdlgg.o \
- monolib_statline.o \
- monolib_statusbr.o \
+ monolib_generic_statline.o \
+ monolib_generic_statusbr.o \
monolib_tabg.o
@COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1)
COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \
@@ -6826,291 +6887,291 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \
monolib_collpaneg.o \
monolib_filepickerg.o \
monolib_fontpickerg.o \
- monolib_statusbr.o \
+ monolib_generic_statusbr.o \
monolib_prntdlgg.o \
- monolib_accel.o \
- monolib_bmpbuttn.o \
- monolib_button.o \
- monolib_checkbox.o \
- monolib_choice.o \
- monolib_colordlg.o \
+ monolib_msw_accel.o \
+ monolib_msw_bmpbuttn.o \
+ monolib_msw_button.o \
+ monolib_msw_checkbox.o \
+ monolib_msw_choice.o \
+ monolib_msw_colordlg.o \
monolib_combo.o \
- monolib_combobox.o \
- monolib_control.o \
- monolib_dialog.o \
- monolib_dirdlg.o \
+ monolib_msw_combobox.o \
+ monolib_msw_control.o \
+ monolib_msw_dialog.o \
+ monolib_msw_dirdlg.o \
monolib_dragimag.o \
- monolib_filedlg.o \
- monolib_frame.o \
- monolib_gauge.o \
- monolib_iniconf.o \
- monolib_listbox.o \
- monolib_listctrl.o \
- monolib_mdi.o \
- monolib_menu.o \
- monolib_menuitem.o \
- monolib_metafile.o \
- monolib_msgdlg.o \
- monolib_nativdlg.o \
- monolib_nativewin.o \
- monolib_notebook.o \
+ monolib_msw_filedlg.o \
+ monolib_msw_frame.o \
+ monolib_msw_gauge.o \
+ monolib_msw_iniconf.o \
+ monolib_msw_listbox.o \
+ monolib_msw_listctrl.o \
+ monolib_msw_mdi.o \
+ monolib_msw_menu.o \
+ monolib_msw_menuitem.o \
+ monolib_msw_metafile.o \
+ monolib_msw_msgdlg.o \
+ monolib_msw_nativdlg.o \
+ monolib_msw_nativewin.o \
+ monolib_msw_notebook.o \
monolib_access.o \
- monolib_ownerdrw.o \
- monolib_radiobox.o \
- monolib_radiobut.o \
- monolib_scrolbar.o \
- monolib_slider.o \
- monolib_spinbutt.o \
- monolib_spinctrl.o \
- monolib_statbmp.o \
- monolib_statbox.o \
+ monolib_msw_ownerdrw.o \
+ monolib_msw_radiobox.o \
+ monolib_msw_radiobut.o \
+ monolib_msw_scrolbar.o \
+ monolib_msw_slider.o \
+ monolib_msw_spinbutt.o \
+ monolib_msw_spinctrl.o \
+ monolib_msw_statbmp.o \
+ monolib_msw_statbox.o \
monolib_statusbar.o \
- monolib_statline.o \
- monolib_stattext.o \
- monolib_tabctrl.o \
- monolib_toolbar.o \
- monolib_textctrl.o \
- monolib_textentry.o \
- monolib_tglbtn.o \
+ monolib_msw_statline.o \
+ monolib_msw_stattext.o \
+ monolib_msw_tabctrl.o \
+ monolib_msw_toolbar.o \
+ monolib_msw_textctrl.o \
+ monolib_msw_textentry.o \
+ monolib_msw_tglbtn.o \
monolib_treectrl.o \
- monolib_checklst.o \
- monolib_fdrepdlg.o \
- monolib_fontdlg.o
+ monolib_msw_checklst.o \
+ monolib_msw_fdrepdlg.o \
+ monolib_msw_fontdlg.o
@COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1)
COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS_1 = \
$(__OSX_CARBON_COCOA_SRC_OBJECTS_0) \
- monolib_bmpbuttn.o \
- monolib_button.o \
- monolib_checkbox.o \
- monolib_choice.o \
- monolib_colordlg.o \
- monolib_dialog.o \
- monolib_dirdlg.o \
- monolib_evtloop.o \
- monolib_filedlg.o \
- monolib_gauge.o \
- monolib_listbox.o \
+ monolib_carbon_bmpbuttn.o \
+ monolib_carbon_button.o \
+ monolib_carbon_checkbox.o \
+ monolib_carbon_choice.o \
+ monolib_carbon_colordlg.o \
+ monolib_carbon_dialog.o \
+ monolib_carbon_dirdlg.o \
+ monolib_carbon_evtloop.o \
+ monolib_carbon_filedlg.o \
+ monolib_carbon_gauge.o \
+ monolib_carbon_listbox.o \
monolib_listctrl_mac.o \
- monolib_menu.o \
- monolib_menuitem.o \
- monolib_msgdlg.o \
- monolib_nonownedwnd.o \
+ monolib_carbon_menu.o \
+ monolib_carbon_menuitem.o \
+ monolib_carbon_msgdlg.o \
+ monolib_carbon_nonownedwnd.o \
monolib_notebmac.o \
- monolib_radiobut.o \
- monolib_region.o \
- monolib_scrolbar.o \
- monolib_slider.o \
- monolib_spinbutt.o \
- monolib_srchctrl.o \
- monolib_statbmp.o \
- monolib_statbox.o \
+ monolib_carbon_radiobut.o \
+ monolib_carbon_region.o \
+ monolib_carbon_scrolbar.o \
+ monolib_carbon_slider.o \
+ monolib_carbon_spinbutt.o \
+ monolib_carbon_srchctrl.o \
+ monolib_carbon_statbmp.o \
+ monolib_carbon_statbox.o \
monolib_statlmac.o \
- monolib_stattext.o \
- monolib_textctrl.o \
- monolib_tglbtn.o \
- monolib_toolbar.o \
- monolib_tooltip.o \
- monolib_window.o \
+ monolib_carbon_stattext.o \
+ monolib_carbon_textctrl.o \
+ monolib_carbon_tglbtn.o \
+ monolib_carbon_toolbar.o \
+ monolib_carbon_tooltip.o \
+ monolib_carbon_window.o \
monolib_webkit.o \
- monolib_caret.o \
+ monolib_generic_caret.o \
monolib_clrpickerg.o \
monolib_collpaneg.o \
- monolib_fdrepdlg.o \
+ monolib_generic_fdrepdlg.o \
monolib_filepickerg.o \
monolib_fontdlgg.o \
monolib_fontpickerg.o \
- monolib_listctrl.o \
+ monolib_generic_listctrl.o \
monolib_prntdlgg.o \
- monolib_statusbr.o \
+ monolib_generic_statusbr.o \
monolib_tabg.o
@COND_TOOLKIT_OSX_CARBON@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS_1)
COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_1 = \
$(__OSX_CARBON_COCOA_SRC_OBJECTS_0) \
- monolib_bmpbuttn.o \
- monolib_button.o \
- monolib_checkbox.o \
- monolib_choice.o \
- monolib_dialog.o \
- monolib_dirdlg.o \
- monolib_evtloop.o \
- monolib_filedlg.o \
- monolib_gauge.o \
- monolib_listbox.o \
- monolib_menu.o \
- monolib_menuitem.o \
- monolib_msgdlg.o \
- monolib_nonownedwnd.o \
- monolib_notebook.o \
- monolib_radiobut.o \
- monolib_scrolbar.o \
- monolib_slider.o \
- monolib_spinbutt.o \
- monolib_srchctrl.o \
- monolib_statbox.o \
- monolib_statline.o \
- monolib_stattext.o \
- monolib_textctrl.o \
- monolib_tglbtn.o \
- monolib_toolbar.o \
- monolib_tooltip.o \
- monolib_window.o \
- monolib_caret.o \
+ monolib_osx_cocoa_bmpbuttn.o \
+ monolib_osx_cocoa_button.o \
+ monolib_osx_cocoa_checkbox.o \
+ monolib_osx_cocoa_choice.o \
+ monolib_osx_cocoa_dialog.o \
+ monolib_osx_cocoa_dirdlg.o \
+ monolib_osx_cocoa_evtloop.o \
+ monolib_osx_cocoa_filedlg.o \
+ monolib_osx_cocoa_gauge.o \
+ monolib_osx_cocoa_listbox.o \
+ monolib_osx_cocoa_menu.o \
+ monolib_osx_cocoa_menuitem.o \
+ monolib_osx_cocoa_msgdlg.o \
+ monolib_cocoa_nonownedwnd.o \
+ monolib_osx_cocoa_notebook.o \
+ monolib_osx_cocoa_radiobut.o \
+ monolib_osx_cocoa_scrolbar.o \
+ monolib_osx_cocoa_slider.o \
+ monolib_osx_cocoa_spinbutt.o \
+ monolib_cocoa_srchctrl.o \
+ monolib_osx_cocoa_statbox.o \
+ monolib_cocoa_statline.o \
+ monolib_osx_cocoa_stattext.o \
+ monolib_osx_cocoa_textctrl.o \
+ monolib_cocoa_tglbtn.o \
+ monolib_osx_cocoa_toolbar.o \
+ monolib_osx_cocoa_tooltip.o \
+ monolib_osx_cocoa_window.o \
+ monolib_generic_caret.o \
monolib_clrpickerg.o \
monolib_collpaneg.o \
- monolib_fdrepdlg.o \
+ monolib_generic_fdrepdlg.o \
monolib_filepickerg.o \
monolib_fontdlgg.o \
monolib_fontpickerg.o \
- monolib_listctrl.o \
+ monolib_generic_listctrl.o \
monolib_prntdlgg.o \
monolib_regiong.o \
- monolib_statusbr.o \
+ monolib_generic_statusbr.o \
monolib_tabg.o
@COND_TOOLKIT_OSX_COCOA@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_1)
COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1 = \
- monolib_caret.o \
+ monolib_generic_caret.o \
monolib_clrpickerg.o \
monolib_collpaneg.o \
monolib_colrdlgg.o \
monolib_dirdlgg.o \
- monolib_fdrepdlg.o \
+ monolib_generic_fdrepdlg.o \
monolib_filepickerg.o \
monolib_fontpickerg.o \
- monolib_imaglist.o \
- monolib_listctrl.o \
+ monolib_generic_imaglist.o \
+ monolib_generic_listctrl.o \
monolib_mdig.o \
monolib_prntdlgg.o \
- monolib_statusbr.o \
- monolib_accel.o \
- monolib_app.o \
- monolib_bitmap.o \
- monolib_bmpbuttn.o \
- monolib_brush.o \
- monolib_button.o \
- monolib_checkbox.o \
- monolib_checklst.o \
- monolib_choice.o \
- monolib_clipbrd.o \
- monolib_colour.o \
- monolib_combobox.o \
- monolib_control.o \
- monolib_cursor.o \
- monolib_data.o \
- monolib_dataobj.o \
- monolib_dc.o \
- monolib_dcclient.o \
- monolib_dcmemory.o \
- monolib_dcprint.o \
- monolib_dcscreen.o \
- monolib_dialog.o \
- monolib_dnd.o \
- monolib_evtloop.o \
- monolib_filedlg.o \
- monolib_font.o \
- monolib_fontdlg.o \
- monolib_fontenum.o \
- monolib_fontutil.o \
- monolib_frame.o \
- monolib_gauge.o \
- monolib_gdiimage.o \
+ monolib_generic_statusbr.o \
+ monolib_os2_accel.o \
+ monolib_os2_app.o \
+ monolib_os2_bitmap.o \
+ monolib_os2_bmpbuttn.o \
+ monolib_os2_brush.o \
+ monolib_os2_button.o \
+ monolib_os2_checkbox.o \
+ monolib_os2_checklst.o \
+ monolib_os2_choice.o \
+ monolib_os2_clipbrd.o \
+ monolib_os2_colour.o \
+ monolib_os2_combobox.o \
+ monolib_os2_control.o \
+ monolib_os2_cursor.o \
+ monolib_os2_data.o \
+ monolib_os2_dataobj.o \
+ monolib_os2_dc.o \
+ monolib_os2_dcclient.o \
+ monolib_os2_dcmemory.o \
+ monolib_os2_dcprint.o \
+ monolib_os2_dcscreen.o \
+ monolib_os2_dialog.o \
+ monolib_os2_dnd.o \
+ monolib_os2_evtloop.o \
+ monolib_os2_filedlg.o \
+ monolib_os2_font.o \
+ monolib_os2_fontdlg.o \
+ monolib_os2_fontenum.o \
+ monolib_os2_fontutil.o \
+ monolib_os2_frame.o \
+ monolib_os2_gauge.o \
+ monolib_os2_gdiimage.o \
monolib_gsockpm.o \
- monolib_helpwin.o \
- monolib_icon.o \
- monolib_iniconf.o \
- monolib_listbox.o \
- monolib_main.o \
- monolib_menu.o \
- monolib_menuitem.o \
- monolib_metafile.o \
- monolib_minifram.o \
- monolib_msgdlg.o \
- monolib_nativdlg.o \
- monolib_notebook.o \
- monolib_ownerdrw.o \
- monolib_palette.o \
- monolib_pen.o \
- monolib_popupwin.o \
- monolib_print.o \
- monolib_radiobox.o \
- monolib_radiobut.o \
- monolib_region.o \
- monolib_scrolbar.o \
- monolib_settings.o \
- monolib_slider.o \
- monolib_spinbutt.o \
- monolib_spinctrl.o \
- monolib_statbmp.o \
- monolib_statbox.o \
- monolib_statline.o \
- monolib_stattext.o \
- monolib_tabctrl.o \
- monolib_textctrl.o \
- monolib_textentry.o \
- monolib_tglbtn.o \
- monolib_timer.o \
- monolib_toolbar.o \
- monolib_tooltip.o \
- monolib_toplevel.o \
- monolib_utilsgui.o \
- monolib_window.o
+ monolib_os2_helpwin.o \
+ monolib_os2_icon.o \
+ monolib_os2_iniconf.o \
+ monolib_os2_listbox.o \
+ monolib_os2_main.o \
+ monolib_os2_menu.o \
+ monolib_os2_menuitem.o \
+ monolib_os2_metafile.o \
+ monolib_os2_minifram.o \
+ monolib_os2_msgdlg.o \
+ monolib_os2_nativdlg.o \
+ monolib_os2_notebook.o \
+ monolib_os2_ownerdrw.o \
+ monolib_os2_palette.o \
+ monolib_os2_pen.o \
+ monolib_os2_popupwin.o \
+ monolib_os2_print.o \
+ monolib_os2_radiobox.o \
+ monolib_os2_radiobut.o \
+ monolib_os2_region.o \
+ monolib_os2_scrolbar.o \
+ monolib_os2_settings.o \
+ monolib_os2_slider.o \
+ monolib_os2_spinbutt.o \
+ monolib_os2_spinctrl.o \
+ monolib_os2_statbmp.o \
+ monolib_os2_statbox.o \
+ monolib_os2_statline.o \
+ monolib_os2_stattext.o \
+ monolib_os2_tabctrl.o \
+ monolib_os2_textctrl.o \
+ monolib_os2_textentry.o \
+ monolib_os2_tglbtn.o \
+ monolib_os2_timer.o \
+ monolib_os2_toolbar.o \
+ monolib_os2_tooltip.o \
+ monolib_os2_toplevel.o \
+ monolib_os2_utilsgui.o \
+ monolib_os2_window.o
@COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1)
COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 = \
monolib_clrpickerg.o \
monolib_collpaneg.o \
monolib_filepickerg.o \
monolib_fontpickerg.o \
- monolib_statusbr.o \
+ monolib_generic_statusbr.o \
monolib_prntdlgg.o \
- monolib_accel.o \
- monolib_bmpbuttn.o \
- monolib_button.o \
- monolib_checkbox.o \
- monolib_choice.o \
- monolib_colordlg.o \
+ monolib_msw_accel.o \
+ monolib_msw_bmpbuttn.o \
+ monolib_msw_button.o \
+ monolib_msw_checkbox.o \
+ monolib_msw_choice.o \
+ monolib_msw_colordlg.o \
monolib_combo.o \
- monolib_combobox.o \
- monolib_control.o \
- monolib_dialog.o \
- monolib_dirdlg.o \
+ monolib_msw_combobox.o \
+ monolib_msw_control.o \
+ monolib_msw_dialog.o \
+ monolib_msw_dirdlg.o \
monolib_dragimag.o \
- monolib_filedlg.o \
- monolib_frame.o \
- monolib_gauge.o \
- monolib_iniconf.o \
- monolib_listbox.o \
- monolib_listctrl.o \
- monolib_mdi.o \
- monolib_menu.o \
- monolib_menuitem.o \
- monolib_metafile.o \
- monolib_msgdlg.o \
- monolib_nativdlg.o \
- monolib_nativewin.o \
- monolib_notebook.o \
+ monolib_msw_filedlg.o \
+ monolib_msw_frame.o \
+ monolib_msw_gauge.o \
+ monolib_msw_iniconf.o \
+ monolib_msw_listbox.o \
+ monolib_msw_listctrl.o \
+ monolib_msw_mdi.o \
+ monolib_msw_menu.o \
+ monolib_msw_menuitem.o \
+ monolib_msw_metafile.o \
+ monolib_msw_msgdlg.o \
+ monolib_msw_nativdlg.o \
+ monolib_msw_nativewin.o \
+ monolib_msw_notebook.o \
monolib_access.o \
- monolib_ownerdrw.o \
- monolib_radiobox.o \
- monolib_radiobut.o \
- monolib_scrolbar.o \
- monolib_slider.o \
- monolib_spinbutt.o \
- monolib_spinctrl.o \
- monolib_statbmp.o \
- monolib_statbox.o \
+ monolib_msw_ownerdrw.o \
+ monolib_msw_radiobox.o \
+ monolib_msw_radiobut.o \
+ monolib_msw_scrolbar.o \
+ monolib_msw_slider.o \
+ monolib_msw_spinbutt.o \
+ monolib_msw_spinctrl.o \
+ monolib_msw_statbmp.o \
+ monolib_msw_statbox.o \
monolib_statusbar.o \
- monolib_statline.o \
- monolib_stattext.o \
- monolib_tabctrl.o \
- monolib_toolbar.o \
- monolib_textctrl.o \
- monolib_textentry.o \
- monolib_tglbtn.o \
+ monolib_msw_statline.o \
+ monolib_msw_stattext.o \
+ monolib_msw_tabctrl.o \
+ monolib_msw_toolbar.o \
+ monolib_msw_textctrl.o \
+ monolib_msw_textentry.o \
+ monolib_msw_tglbtn.o \
monolib_treectrl.o \
monolib_dirdlgg.o \
- monolib_fdrepdlg.o \
+ monolib_generic_fdrepdlg.o \
monolib_filedlgg.o \
monolib_fontdlgg.o \
- monolib_checklst.o \
+ monolib_wince_checklst.o \
monolib_choicece.o \
monolib_crt.o \
monolib_filedlgwce.o \
@@ -7124,209 +7185,209 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 = \
@COND_TOOLKIT_COCOA@ monolib_hid.o monolib_utilsexc_cf.o
COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_3 = \
monolib_fontmgrcmn.o \
- monolib_caret.o \
- monolib_colour.o \
- monolib_icon.o \
- monolib_imaglist.o \
+ monolib_generic_caret.o \
+ monolib_generic_colour.o \
+ monolib_generic_icon.o \
+ monolib_generic_imaglist.o \
monolib_mask.o \
- monolib_timer.o \
- monolib_app.o \
- monolib_bitmap.o \
- monolib_brush.o \
- monolib_cursor.o \
- monolib_dc.o \
- monolib_dcclient.o \
- monolib_dcmemory.o \
- monolib_dcscreen.o \
- monolib_evtloop.o \
- monolib_font.o \
- monolib_fontenum.o \
- monolib_fontmgr.o \
- monolib_nonownedwnd.o \
- monolib_overlay.o \
- monolib_pen.o \
- monolib_region.o \
- monolib_settings.o \
- monolib_toplevel.o \
- monolib_utils.o \
- monolib_window.o \
+ monolib_generic_timer.o \
+ monolib_dfb_app.o \
+ monolib_dfb_bitmap.o \
+ monolib_dfb_brush.o \
+ monolib_dfb_cursor.o \
+ monolib_dfb_dc.o \
+ monolib_dfb_dcclient.o \
+ monolib_dfb_dcmemory.o \
+ monolib_dfb_dcscreen.o \
+ monolib_dfb_evtloop.o \
+ monolib_dfb_font.o \
+ monolib_dfb_fontenum.o \
+ monolib_dfb_fontmgr.o \
+ monolib_dfb_nonownedwnd.o \
+ monolib_dfb_overlay.o \
+ monolib_dfb_pen.o \
+ monolib_dfb_region.o \
+ monolib_dfb_settings.o \
+ monolib_dfb_toplevel.o \
+ monolib_dfb_utils.o \
+ monolib_dfb_window.o \
monolib_wrapdfb.o
@COND_TOOLKIT_DFB@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_3)
COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_3 = \
- monolib_caret.o \
- monolib_imaglist.o \
- monolib_dialup.o \
- monolib_fontenum.o \
- monolib_fontutil.o \
+ monolib_generic_caret.o \
+ monolib_generic_imaglist.o \
+ monolib_unix_dialup.o \
+ monolib_unix_fontenum.o \
+ monolib_unix_fontutil.o \
monolib_utilsx11.o \
monolib_displayx11.o \
- monolib_icon.o \
+ monolib_generic_icon.o \
monolib_paletteg.o \
- monolib_app.o \
- monolib_bitmap.o \
- monolib_brush.o \
- monolib_clipbrd.o \
- monolib_colour.o \
- monolib_cursor.o \
- monolib_data.o \
- monolib_dataobj.o \
- monolib_dc.o \
- monolib_dcclient.o \
- monolib_dcmemory.o \
- monolib_dcscreen.o \
- monolib_dnd.o \
- monolib_evtloop.o \
- monolib_font.o \
- monolib_gsockgtk.o \
- monolib_main.o \
- monolib_minifram.o \
- monolib_pen.o \
- monolib_popupwin.o \
- monolib_region.o \
- monolib_renderer.o \
- monolib_settings.o \
- monolib_timer.o \
- monolib_tooltip.o \
- monolib_toplevel.o \
- monolib_utilsgtk.o \
- monolib_win_gtk.o \
- monolib_window.o
+ monolib_gtk1_app.o \
+ monolib_gtk1_bitmap.o \
+ monolib_gtk1_brush.o \
+ monolib_gtk1_clipbrd.o \
+ monolib_gtk1_colour.o \
+ monolib_gtk1_cursor.o \
+ monolib_gtk1_data.o \
+ monolib_gtk1_dataobj.o \
+ monolib_gtk1_dc.o \
+ monolib_gtk1_dcclient.o \
+ monolib_gtk1_dcmemory.o \
+ monolib_gtk1_dcscreen.o \
+ monolib_gtk1_dnd.o \
+ monolib_gtk1_evtloop.o \
+ monolib_gtk1_font.o \
+ monolib_gtk1_gsockgtk.o \
+ monolib_gtk1_main.o \
+ monolib_gtk1_minifram.o \
+ monolib_gtk1_pen.o \
+ monolib_gtk1_popupwin.o \
+ monolib_gtk1_region.o \
+ monolib_gtk1_renderer.o \
+ monolib_gtk1_settings.o \
+ monolib_gtk1_timer.o \
+ monolib_gtk1_tooltip.o \
+ monolib_gtk1_toplevel.o \
+ monolib_gtk1_utilsgtk.o \
+ monolib_gtk1_win_gtk.o \
+ monolib_gtk1_window.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_3)
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_3 = \
- monolib_caret.o \
- monolib_imaglist.o \
- monolib_dialup.o \
- monolib_fontenum.o \
- monolib_fontutil.o \
+ monolib_generic_caret.o \
+ monolib_generic_imaglist.o \
+ monolib_unix_dialup.o \
+ monolib_unix_fontenum.o \
+ monolib_unix_fontutil.o \
monolib_utilsx11.o \
monolib_displayx11.o \
- monolib_icon.o \
+ monolib_generic_icon.o \
monolib_paletteg.o \
- monolib_app.o \
+ monolib_gtk_app.o \
monolib_assertdlg_gtk.o \
- monolib_bitmap.o \
- monolib_brush.o \
- monolib_clipbrd.o \
- monolib_colour.o \
- monolib_cursor.o \
- monolib_dataobj.o \
- monolib_dc.o \
- monolib_dcclient.o \
- monolib_dcmemory.o \
- monolib_dcscreen.o \
- monolib_dnd.o \
- monolib_evtloop.o \
+ monolib_gtk_bitmap.o \
+ monolib_gtk_brush.o \
+ monolib_gtk_clipbrd.o \
+ monolib_gtk_colour.o \
+ monolib_gtk_cursor.o \
+ monolib_gtk_dataobj.o \
+ monolib_gtk_dc.o \
+ monolib_gtk_dcclient.o \
+ monolib_gtk_dcmemory.o \
+ monolib_gtk_dcscreen.o \
+ monolib_gtk_dnd.o \
+ monolib_gtk_evtloop.o \
monolib_filectrl.o \
- monolib_font.o \
- monolib_gsockgtk.o \
- monolib_minifram.o \
- monolib_pen.o \
- monolib_popupwin.o \
+ monolib_gtk_font.o \
+ monolib_gtk_gsockgtk.o \
+ monolib_gtk_minifram.o \
+ monolib_gtk_pen.o \
+ monolib_gtk_popupwin.o \
monolib_private.o \
- monolib_region.o \
- monolib_renderer.o \
- monolib_settings.o \
- monolib_timer.o \
- monolib_tooltip.o \
- monolib_toplevel.o \
- monolib_utilsgtk.o \
- monolib_win_gtk.o \
- monolib_window.o
+ monolib_gtk_region.o \
+ monolib_gtk_renderer.o \
+ monolib_gtk_settings.o \
+ monolib_gtk_timer.o \
+ monolib_gtk_tooltip.o \
+ monolib_gtk_toplevel.o \
+ monolib_gtk_utilsgtk.o \
+ monolib_gtk_win_gtk.o \
+ monolib_gtk_window.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_3)
COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_3 = \
monolib_fontmgrcmn.o \
- monolib_caret.o \
- monolib_colour.o \
- monolib_icon.o \
- monolib_imaglist.o \
+ monolib_generic_caret.o \
+ monolib_generic_colour.o \
+ monolib_generic_icon.o \
+ monolib_generic_imaglist.o \
monolib_mask.o \
- monolib_timer.o \
- monolib_app.o \
- monolib_bitmap.o \
- monolib_brush.o \
- monolib_clipbrd.o \
- monolib_cursor.o \
- monolib_data.o \
- monolib_dc.o \
- monolib_dcclient.o \
- monolib_dcmemory.o \
- monolib_dcscreen.o \
+ monolib_generic_timer.o \
+ monolib_mgl_app.o \
+ monolib_mgl_bitmap.o \
+ monolib_mgl_brush.o \
+ monolib_mgl_clipbrd.o \
+ monolib_mgl_cursor.o \
+ monolib_mgl_data.o \
+ monolib_mgl_dc.o \
+ monolib_mgl_dcclient.o \
+ monolib_mgl_dcmemory.o \
+ monolib_mgl_dcscreen.o \
monolib_dirmgl.o \
- monolib_evtloop.o \
- monolib_font.o \
- monolib_fontenum.o \
- monolib_fontmgr.o \
- monolib_fontutil.o \
- monolib_palette.o \
- monolib_pen.o \
- monolib_region.o \
- monolib_settings.o \
- monolib_toplevel.o \
- monolib_utils.o \
- monolib_window.o
+ monolib_mgl_evtloop.o \
+ monolib_mgl_font.o \
+ monolib_mgl_fontenum.o \
+ monolib_mgl_fontmgr.o \
+ monolib_mgl_fontutil.o \
+ monolib_mgl_palette.o \
+ monolib_mgl_pen.o \
+ monolib_mgl_region.o \
+ monolib_mgl_settings.o \
+ monolib_mgl_toplevel.o \
+ monolib_mgl_utils.o \
+ monolib_mgl_window.o
@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_3)
COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_3 = \
- monolib_caret.o \
- monolib_imaglist.o \
- monolib_dialup.o \
- monolib_fontenum.o \
- monolib_fontutil.o \
+ monolib_generic_caret.o \
+ monolib_generic_imaglist.o \
+ monolib_unix_dialup.o \
+ monolib_unix_fontenum.o \
+ monolib_unix_fontutil.o \
monolib_utilsx11.o \
monolib_displayx11.o \
- monolib_bitmap.o \
- monolib_brush.o \
- monolib_palette.o \
- monolib_pen.o \
- monolib_region.o \
+ monolib_x11_bitmap.o \
+ monolib_x11_brush.o \
+ monolib_x11_palette.o \
+ monolib_x11_pen.o \
+ monolib_x11_region.o \
monolib_utilsx.o
@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_3)
COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 = \
- monolib_app.o \
- monolib_bitmap.o \
- monolib_brush.o \
- monolib_caret.o \
- monolib_clipbrd.o \
- monolib_colour.o \
- monolib_cursor.o \
- monolib_data.o \
- monolib_dc.o \
- monolib_dcclient.o \
- monolib_dcmemory.o \
- monolib_dcprint.o \
- monolib_dcscreen.o \
- monolib_dialup.o \
+ monolib_msw_app.o \
+ monolib_msw_bitmap.o \
+ monolib_msw_brush.o \
+ monolib_msw_caret.o \
+ monolib_msw_clipbrd.o \
+ monolib_msw_colour.o \
+ monolib_msw_cursor.o \
+ monolib_msw_data.o \
+ monolib_msw_dc.o \
+ monolib_msw_dcclient.o \
+ monolib_msw_dcmemory.o \
+ monolib_msw_dcprint.o \
+ monolib_msw_dcscreen.o \
+ monolib_msw_dialup.o \
monolib_dib.o \
- monolib_display.o \
+ monolib_msw_display.o \
monolib_enhmeta.o \
- monolib_font.o \
- monolib_fontenum.o \
- monolib_fontutil.o \
- monolib_gdiimage.o \
- monolib_gdiobj.o \
+ monolib_msw_font.o \
+ monolib_msw_fontenum.o \
+ monolib_msw_fontutil.o \
+ monolib_msw_gdiimage.o \
+ monolib_msw_gdiobj.o \
monolib_gdiplus.o \
- monolib_graphics.o \
- monolib_icon.o \
- monolib_imaglist.o \
- monolib_minifram.o \
- monolib_dataobj.o \
+ monolib_msw_graphics.o \
+ monolib_msw_icon.o \
+ monolib_msw_imaglist.o \
+ monolib_msw_minifram.o \
+ monolib_ole_dataobj.o \
monolib_dropsrc.o \
monolib_droptgt.o \
monolib_oleutils.o \
- monolib_palette.o \
- monolib_pen.o \
- monolib_popupwin.o \
- monolib_printdlg.o \
+ monolib_msw_palette.o \
+ monolib_msw_pen.o \
+ monolib_msw_popupwin.o \
+ monolib_msw_printdlg.o \
monolib_printwin.o \
- monolib_region.o \
- monolib_renderer.o \
- monolib_settings.o \
- monolib_tooltip.o \
- monolib_toplevel.o \
- monolib_utilsgui.o \
+ monolib_msw_region.o \
+ monolib_msw_renderer.o \
+ monolib_msw_settings.o \
+ monolib_msw_tooltip.o \
+ monolib_msw_toplevel.o \
+ monolib_msw_utilsgui.o \
monolib_uxtheme.o \
- monolib_window.o \
+ monolib_msw_window.o \
monolib_helpchm.o \
- monolib_helpwin.o \
+ monolib_msw_helpwin.o \
monolib_automtn.o \
monolib_uuid.o
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3)
@@ -7336,87 +7397,87 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 = \
@COND_TOOLKIT_OSX_COCOA@ $(__OSX_LOWLEVEL_SRC_OBJECTS_17)
@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_3 =
COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_3 = \
- monolib_app.o \
- monolib_bitmap.o \
- monolib_brush.o \
- monolib_caret.o \
- monolib_clipbrd.o \
- monolib_colour.o \
- monolib_cursor.o \
- monolib_data.o \
- monolib_dc.o \
- monolib_dcclient.o \
- monolib_dcmemory.o \
- monolib_dcprint.o \
- monolib_dcscreen.o \
- monolib_dialup.o \
+ monolib_msw_app.o \
+ monolib_msw_bitmap.o \
+ monolib_msw_brush.o \
+ monolib_msw_caret.o \
+ monolib_msw_clipbrd.o \
+ monolib_msw_colour.o \
+ monolib_msw_cursor.o \
+ monolib_msw_data.o \
+ monolib_msw_dc.o \
+ monolib_msw_dcclient.o \
+ monolib_msw_dcmemory.o \
+ monolib_msw_dcprint.o \
+ monolib_msw_dcscreen.o \
+ monolib_msw_dialup.o \
monolib_dib.o \
- monolib_display.o \
+ monolib_msw_display.o \
monolib_enhmeta.o \
- monolib_font.o \
- monolib_fontenum.o \
- monolib_fontutil.o \
- monolib_gdiimage.o \
- monolib_gdiobj.o \
+ monolib_msw_font.o \
+ monolib_msw_fontenum.o \
+ monolib_msw_fontutil.o \
+ monolib_msw_gdiimage.o \
+ monolib_msw_gdiobj.o \
monolib_gdiplus.o \
- monolib_graphics.o \
- monolib_icon.o \
- monolib_imaglist.o \
- monolib_minifram.o \
- monolib_dataobj.o \
+ monolib_msw_graphics.o \
+ monolib_msw_icon.o \
+ monolib_msw_imaglist.o \
+ monolib_msw_minifram.o \
+ monolib_ole_dataobj.o \
monolib_dropsrc.o \
monolib_droptgt.o \
monolib_oleutils.o \
- monolib_palette.o \
- monolib_pen.o \
- monolib_popupwin.o \
- monolib_printdlg.o \
+ monolib_msw_palette.o \
+ monolib_msw_pen.o \
+ monolib_msw_popupwin.o \
+ monolib_msw_printdlg.o \
monolib_printwin.o \
- monolib_region.o \
- monolib_renderer.o \
- monolib_settings.o \
- monolib_tooltip.o \
- monolib_toplevel.o \
- monolib_utilsgui.o \
+ monolib_msw_region.o \
+ monolib_msw_renderer.o \
+ monolib_msw_settings.o \
+ monolib_msw_tooltip.o \
+ monolib_msw_toplevel.o \
+ monolib_msw_utilsgui.o \
monolib_uxtheme.o \
- monolib_window.o
+ monolib_msw_window.o
@COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_3)
COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3 = \
- monolib_caret.o \
- monolib_imaglist.o \
- monolib_dialup.o \
- monolib_fontenum.o \
- monolib_fontutil.o \
+ monolib_generic_caret.o \
+ monolib_generic_imaglist.o \
+ monolib_unix_dialup.o \
+ monolib_unix_fontenum.o \
+ monolib_unix_fontutil.o \
monolib_utilsx11.o \
monolib_displayx11.o \
- monolib_icon.o \
- monolib_timer.o \
- monolib_app.o \
- monolib_bitmap.o \
- monolib_brush.o \
- monolib_clipbrd.o \
- monolib_colour.o \
- monolib_cursor.o \
- monolib_data.o \
- monolib_dataobj.o \
- monolib_dc.o \
- monolib_dcclient.o \
- monolib_dcmemory.o \
- monolib_dcscreen.o \
- monolib_evtloop.o \
- monolib_font.o \
- monolib_minifram.o \
+ monolib_generic_icon.o \
+ monolib_generic_timer.o \
+ monolib_x11_app.o \
+ monolib_x11_bitmap.o \
+ monolib_x11_brush.o \
+ monolib_x11_clipbrd.o \
+ monolib_x11_colour.o \
+ monolib_x11_cursor.o \
+ monolib_x11_data.o \
+ monolib_x11_dataobj.o \
+ monolib_x11_dc.o \
+ monolib_x11_dcclient.o \
+ monolib_x11_dcmemory.o \
+ monolib_x11_dcscreen.o \
+ monolib_x11_evtloop.o \
+ monolib_x11_font.o \
+ monolib_x11_minifram.o \
monolib_nanox.o \
- monolib_palette.o \
- monolib_pen.o \
- monolib_popupwin.o \
- monolib_region.o \
+ monolib_x11_palette.o \
+ monolib_x11_pen.o \
+ monolib_x11_popupwin.o \
+ monolib_x11_region.o \
monolib_reparent.o \
- monolib_settings.o \
- monolib_toplevel.o \
- monolib_utils.o \
+ monolib_x11_settings.o \
+ monolib_x11_toplevel.o \
+ monolib_x11_utils.o \
monolib_utilsx.o \
- monolib_window.o
+ monolib_x11_window.o
@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3)
COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_1 = \
monolib_animatecmn.o \
@@ -7475,28 +7536,31 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_1 = \
monolib_animateg.o
@COND_WXUNIV_1@__ADVANCED_SRC_OBJECTS_1 = $(COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_1)
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 = \
- monolib_aboutdlg.o \
+ monolib_gtk_aboutdlg.o \
monolib_animate.o \
- monolib_bmpcbox.o \
- monolib_calctrl.o \
- monolib_dataview.o \
+ monolib_gtk_bmpcbox.o \
+ monolib_gtk_calctrl.o \
+ monolib_gtk_dataview.o \
monolib_hyperlink.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1)
COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 = \
- monolib_bmpcbox.o \
- monolib_calctrl.o \
+ monolib_msw_bmpcbox.o \
+ monolib_msw_calctrl.o \
monolib_datecontrols.o \
monolib_datectrl.o
@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1)
COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 = \
- monolib_bmpcbox.o \
- monolib_calctrl.o \
+ monolib_msw_bmpcbox.o \
+ monolib_msw_calctrl.o \
monolib_datecontrols.o \
monolib_datectrl.o
@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1)
-@COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_1 = monolib_mediactrl.o
-@COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS_1 = monolib_mediactrl.o
-@COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS_1 = monolib_mediactrl.o
+@COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_1 = \
+@COND_TOOLKIT_COCOA@ monolib_cocoa_mediactrl.o
+@COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS_1 = \
+@COND_TOOLKIT_GTK@ monolib_unix_mediactrl.o
+@COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS_1 = \
+@COND_TOOLKIT_MOTIF@ monolib_unix_mediactrl.o
COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_1 = \
monolib_mediactrl_am.o \
monolib_mediactrl_wmp10.o \
@@ -7504,7 +7568,7 @@ COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_1 = \
monolib_activex.o
@COND_TOOLKIT_MSW@__MEDIA_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_1)
@COND_TOOLKIT_OSX_CARBON@__MEDIA_PLATFORM_SRC_OBJECTS_1 \
-@COND_TOOLKIT_OSX_CARBON@ = monolib_mediactrl.o
+@COND_TOOLKIT_OSX_CARBON@ = monolib_carbon_mediactrl.o
@COND_TOOLKIT_OSX_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_1 =
@COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS_1 =
COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS_1 = \
@@ -7513,7 +7577,7 @@ COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS_1 = \
monolib_mediactrl_qt.o \
monolib_activex.o
@COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS_1)
-@COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS_1 = monolib_mediactrl.o
+@COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS_1 = monolib_unix_mediactrl.o
@COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_chm.o
@COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_chm.o
@COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_helpbest.o
@@ -7534,11 +7598,11 @@ COND_PLATFORM_OS2_1___basedll___importlib = -import \
COND_WINDOWS_IMPLIB_1___basedll___importlib = \
-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_WINDOWS_IMPLIB_1@__basedll___importlib = $(COND_WINDOWS_IMPLIB_1___basedll___importlib)
-@COND_GCC_PCH_1@__basedll_PCH_INC = -I.pch/wxprec_basedll
+@COND_GCC_PCH_1@__basedll_PCH_INC = -I./.pch/wxprec_basedll
@COND_ICC_PCH_1@__basedll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_basedll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_basedll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_basedll/wx/wxprec.h.gch
+@COND_ICC_PCH_1@ ./.pch/wxprec_basedll/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_basedll_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@ = ./.pch/wxprec_basedll/wx/wxprec.h.gch
COND_USE_SOVERLINUX_1___basedll___soname_flags = \
$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
@COND_USE_SOVERLINUX_1@__basedll___soname_flags = $(COND_USE_SOVERLINUX_1___basedll___soname_flags)
@@ -7571,7 +7635,7 @@ COND_USE_SOSYMLINKS_1___basedll___so_symlinks_uninst_cmd = rm -f \
@COND_USE_SOSYMLINKS_1@__basedll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___basedll___so_symlinks_uninst_cmd)
@COND_PLATFORM_WIN32_1@__basedll___win32rc = basedll_version_rc.o
COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_2 = \
- basedll_mimetype.o \
+ basedll_core_mimetype.o \
basedll_cfstring.o \
basedll_gsockosx.o \
basedll_stdpaths_cf.o \
@@ -7582,17 +7646,17 @@ COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_2 = \
basedll_epolldispatcher.o \
basedll_appunix.o \
basedll_evtloopunix.o \
- basedll_dir.o \
+ basedll_unix_dir.o \
basedll_dlunix.o \
- basedll_snglinst.o \
- basedll_stdpaths.o \
+ basedll_unix_snglinst.o \
+ basedll_unix_stdpaths.o \
basedll_timerunx.o \
basedll_threadpsx.o \
- basedll_stackwalk.o \
+ basedll_unix_stackwalk.o \
basedll_utilsunx.o
@COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_2)
@COND_PLATFORM_MSDOS_1@__BASE_PLATFORM_SRC_OBJECTS_2 \
-@COND_PLATFORM_MSDOS_1@ = basedll_dir.o basedll_mimetype.o \
+@COND_PLATFORM_MSDOS_1@ = basedll_msdos_dir.o basedll_msdos_mimetype.o \
@COND_PLATFORM_MSDOS_1@ basedll_utilsdos.o
COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_2 = \
basedll_fdiodispatcher.o \
@@ -7601,12 +7665,12 @@ COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_2 = \
basedll_appunix.o \
basedll_evtloopunix.o \
basedll_timerunx.o \
- basedll_dir.o \
- basedll_mimetype.o \
- basedll_stdpaths.o \
- basedll_thread.o \
- basedll_utils.o \
- basedll_utilsexc.o
+ basedll_os2_dir.o \
+ basedll_os2_mimetype.o \
+ basedll_os2_stdpaths.o \
+ basedll_os2_thread.o \
+ basedll_os2_utils.o \
+ basedll_os2_utilsexc.o
@COND_PLATFORM_OS2_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_2)
COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_2 = \
basedll_fdiodispatcher.o \
@@ -7614,15 +7678,15 @@ COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_2 = \
basedll_epolldispatcher.o \
basedll_appunix.o \
basedll_evtloopunix.o \
- basedll_dir.o \
+ basedll_unix_dir.o \
basedll_dlunix.o \
- basedll_snglinst.o \
- basedll_stdpaths.o \
+ basedll_unix_snglinst.o \
+ basedll_unix_stdpaths.o \
basedll_timerunx.o \
basedll_threadpsx.o \
- basedll_stackwalk.o \
+ basedll_unix_stackwalk.o \
basedll_utilsunx.o \
- basedll_mimetype.o \
+ basedll_unix_mimetype.o \
basedll_gsocketiohandler.o
@COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_2)
COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 = \
@@ -7630,19 +7694,19 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 = \
basedll_crashrpt.o \
basedll_debughlp.o \
basedll_dde.o \
- basedll_dir.o \
+ basedll_msw_dir.o \
basedll_dlmsw.o \
- basedll_mimetype.o \
+ basedll_msw_mimetype.o \
basedll_power.o \
basedll_regconf.o \
basedll_registry.o \
- basedll_snglinst.o \
- basedll_stackwalk.o \
- basedll_stdpaths.o \
- basedll_thread.o \
+ basedll_msw_snglinst.o \
+ basedll_msw_stackwalk.o \
+ basedll_msw_stdpaths.o \
+ basedll_msw_thread.o \
basedll_timer.o \
- basedll_utils.o \
- basedll_utilsexc.o \
+ basedll_msw_utils.o \
+ basedll_msw_utilsexc.o \
$(__BASE_WINCE_SRC_OBJECTS_2)
@COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2)
@COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS_2 = basedll_time.o
@@ -7651,22 +7715,22 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 = \
@COND_PLATFORM_WIN32_1@ = basedll_evtloop.o basedll_main.o basedll_mslu.o \
@COND_PLATFORM_WIN32_1@ basedll_volume.o
@COND_TOOLKIT_OSX_CARBON@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_2 \
-@COND_TOOLKIT_OSX_CARBON@ = basedll_utils.o basedll_uma.o
+@COND_TOOLKIT_OSX_CARBON@ = basedll_carbon_utils.o basedll_uma.o
@COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_2 \
-@COND_TOOLKIT_OSX_COCOA@ = basedll_utils.o
+@COND_TOOLKIT_OSX_COCOA@ = basedll_cocoa_utils.o
COND_MONOLITHIC_0_SHARED_0___baselib___depname = \
$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
@COND_MONOLITHIC_0_SHARED_0@__baselib___depname = $(COND_MONOLITHIC_0_SHARED_0___baselib___depname)
@COND_MONOLITHIC_0_SHARED_0@__install_baselib___depname = install_baselib
@COND_MONOLITHIC_0_SHARED_0@__uninstall_baselib___depname \
@COND_MONOLITHIC_0_SHARED_0@ = uninstall_baselib
-@COND_GCC_PCH_1@__baselib_PCH_INC = -I.pch/wxprec_baselib
+@COND_GCC_PCH_1@__baselib_PCH_INC = -I./.pch/wxprec_baselib
@COND_ICC_PCH_1@__baselib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_baselib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_baselib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_baselib/wx/wxprec.h.gch
+@COND_ICC_PCH_1@ ./.pch/wxprec_baselib/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_baselib_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@ = ./.pch/wxprec_baselib/wx/wxprec.h.gch
COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_3 = \
- baselib_mimetype.o \
+ baselib_core_mimetype.o \
baselib_cfstring.o \
baselib_gsockosx.o \
baselib_stdpaths_cf.o \
@@ -7677,17 +7741,17 @@ COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_3 = \
baselib_epolldispatcher.o \
baselib_appunix.o \
baselib_evtloopunix.o \
- baselib_dir.o \
+ baselib_unix_dir.o \
baselib_dlunix.o \
- baselib_snglinst.o \
- baselib_stdpaths.o \
+ baselib_unix_snglinst.o \
+ baselib_unix_stdpaths.o \
baselib_timerunx.o \
baselib_threadpsx.o \
- baselib_stackwalk.o \
+ baselib_unix_stackwalk.o \
baselib_utilsunx.o
@COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_3)
@COND_PLATFORM_MSDOS_1@__BASE_PLATFORM_SRC_OBJECTS_3 \
-@COND_PLATFORM_MSDOS_1@ = baselib_dir.o baselib_mimetype.o \
+@COND_PLATFORM_MSDOS_1@ = baselib_msdos_dir.o baselib_msdos_mimetype.o \
@COND_PLATFORM_MSDOS_1@ baselib_utilsdos.o
COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_3 = \
baselib_fdiodispatcher.o \
@@ -7696,12 +7760,12 @@ COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_3 = \
baselib_appunix.o \
baselib_evtloopunix.o \
baselib_timerunx.o \
- baselib_dir.o \
- baselib_mimetype.o \
- baselib_stdpaths.o \
- baselib_thread.o \
- baselib_utils.o \
- baselib_utilsexc.o
+ baselib_os2_dir.o \
+ baselib_os2_mimetype.o \
+ baselib_os2_stdpaths.o \
+ baselib_os2_thread.o \
+ baselib_os2_utils.o \
+ baselib_os2_utilsexc.o
@COND_PLATFORM_OS2_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_3)
COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_3 = \
baselib_fdiodispatcher.o \
@@ -7709,15 +7773,15 @@ COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_3 = \
baselib_epolldispatcher.o \
baselib_appunix.o \
baselib_evtloopunix.o \
- baselib_dir.o \
+ baselib_unix_dir.o \
baselib_dlunix.o \
- baselib_snglinst.o \
- baselib_stdpaths.o \
+ baselib_unix_snglinst.o \
+ baselib_unix_stdpaths.o \
baselib_timerunx.o \
baselib_threadpsx.o \
- baselib_stackwalk.o \
+ baselib_unix_stackwalk.o \
baselib_utilsunx.o \
- baselib_mimetype.o \
+ baselib_unix_mimetype.o \
baselib_gsocketiohandler.o
@COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_3)
COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 = \
@@ -7725,19 +7789,19 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 = \
baselib_crashrpt.o \
baselib_debughlp.o \
baselib_dde.o \
- baselib_dir.o \
+ baselib_msw_dir.o \
baselib_dlmsw.o \
- baselib_mimetype.o \
+ baselib_msw_mimetype.o \
baselib_power.o \
baselib_regconf.o \
baselib_registry.o \
- baselib_snglinst.o \
- baselib_stackwalk.o \
- baselib_stdpaths.o \
- baselib_thread.o \
+ baselib_msw_snglinst.o \
+ baselib_msw_stackwalk.o \
+ baselib_msw_stdpaths.o \
+ baselib_msw_thread.o \
baselib_timer.o \
- baselib_utils.o \
- baselib_utilsexc.o \
+ baselib_msw_utils.o \
+ baselib_msw_utilsexc.o \
$(__BASE_WINCE_SRC_OBJECTS_3)
@COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3)
@COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS_3 = baselib_time.o
@@ -7746,9 +7810,9 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 = \
@COND_PLATFORM_WIN32_1@ = baselib_evtloop.o baselib_main.o baselib_mslu.o \
@COND_PLATFORM_WIN32_1@ baselib_volume.o
@COND_TOOLKIT_OSX_CARBON@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3 \
-@COND_TOOLKIT_OSX_CARBON@ = baselib_utils.o baselib_uma.o
+@COND_TOOLKIT_OSX_CARBON@ = baselib_carbon_utils.o baselib_uma.o
@COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3 \
-@COND_TOOLKIT_OSX_COCOA@ = baselib_utils.o
+@COND_TOOLKIT_OSX_COCOA@ = baselib_cocoa_utils.o
@COND_SHARED_1@____wxbase_namedll_DEP = $(__basedll___depname)
@COND_SHARED_0@____wxbase_namelib_DEP = $(__baselib___depname)
COND_MONOLITHIC_0_SHARED_1___netdll___depname = \
@@ -7765,11 +7829,11 @@ COND_PLATFORM_OS2_1___netdll___importlib = -import \
COND_WINDOWS_IMPLIB_1___netdll___importlib = \
-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_WINDOWS_IMPLIB_1@__netdll___importlib = $(COND_WINDOWS_IMPLIB_1___netdll___importlib)
-@COND_GCC_PCH_1@__netdll_PCH_INC = -I.pch/wxprec_netdll
+@COND_GCC_PCH_1@__netdll_PCH_INC = -I./.pch/wxprec_netdll
@COND_ICC_PCH_1@__netdll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_netdll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_netdll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_netdll/wx/wxprec.h.gch
+@COND_ICC_PCH_1@ ./.pch/wxprec_netdll/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_netdll_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@ = ./.pch/wxprec_netdll/wx/wxprec.h.gch
COND_USE_SOVERLINUX_1___netdll___soname_flags = \
$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
@COND_USE_SOVERLINUX_1@__netdll___soname_flags = $(COND_USE_SOVERLINUX_1___netdll___soname_flags)
@@ -7801,11 +7865,12 @@ COND_USE_SOSYMLINKS_1___netdll___so_symlinks_uninst_cmd = rm -f \
$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_USE_SOSYMLINKS_1@__netdll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___netdll___so_symlinks_uninst_cmd)
@COND_PLATFORM_WIN32_1@__netdll___win32rc = netdll_version_rc.o
-@COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_gsocket.o
-@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_gsocket.o
-@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_gsocket.o
+@COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_2 \
+@COND_PLATFORM_MACOSX_1@ = netdll_unix_gsocket.o
+@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_unix_gsocket.o
+@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_unix_gsocket.o
COND_PLATFORM_WIN32_1___NET_PLATFORM_SRC_OBJECTS_2 = \
- netdll_gsocket.o \
+ netdll_msw_gsocket.o \
netdll_gsockmsw.o \
netdll_urlmsw.o \
$(__NET_WINCE_SRC_OBJECTS_2)
@@ -7816,16 +7881,17 @@ COND_MONOLITHIC_0_SHARED_0___netlib___depname = \
@COND_MONOLITHIC_0_SHARED_0@__netlib___depname = $(COND_MONOLITHIC_0_SHARED_0___netlib___depname)
@COND_MONOLITHIC_0_SHARED_0@__install_netlib___depname = install_netlib
@COND_MONOLITHIC_0_SHARED_0@__uninstall_netlib___depname = uninstall_netlib
-@COND_GCC_PCH_1@__netlib_PCH_INC = -I.pch/wxprec_netlib
+@COND_GCC_PCH_1@__netlib_PCH_INC = -I./.pch/wxprec_netlib
@COND_ICC_PCH_1@__netlib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_netlib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_netlib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_netlib/wx/wxprec.h.gch
-@COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_gsocket.o
-@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_gsocket.o
-@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_gsocket.o
+@COND_ICC_PCH_1@ ./.pch/wxprec_netlib/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_netlib_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@ = ./.pch/wxprec_netlib/wx/wxprec.h.gch
+@COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_3 \
+@COND_PLATFORM_MACOSX_1@ = netlib_unix_gsocket.o
+@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_unix_gsocket.o
+@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_unix_gsocket.o
COND_PLATFORM_WIN32_1___NET_PLATFORM_SRC_OBJECTS_3 = \
- netlib_gsocket.o \
+ netlib_msw_gsocket.o \
netlib_gsockmsw.o \
netlib_urlmsw.o \
$(__NET_WINCE_SRC_OBJECTS_3)
@@ -7849,11 +7915,11 @@ COND_PLATFORM_OS2_1___coredll___importlib = -import \
COND_WINDOWS_IMPLIB_1___coredll___importlib = \
-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_WINDOWS_IMPLIB_1@__coredll___importlib = $(COND_WINDOWS_IMPLIB_1___coredll___importlib)
-@COND_GCC_PCH_1@__coredll_PCH_INC = -I.pch/wxprec_coredll
+@COND_GCC_PCH_1@__coredll_PCH_INC = -I./.pch/wxprec_coredll
@COND_ICC_PCH_1@__coredll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_coredll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_coredll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_coredll/wx/wxprec.h.gch
+@COND_ICC_PCH_1@ ./.pch/wxprec_coredll/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_coredll_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@ = ./.pch/wxprec_coredll/wx/wxprec.h.gch
COND_USE_SOVERLINUX_1___coredll___soname_flags = \
$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
@COND_USE_SOVERLINUX_1@__coredll___soname_flags = $(COND_USE_SOVERLINUX_1___coredll___soname_flags)
@@ -7887,12 +7953,12 @@ COND_USE_SOSYMLINKS_1___coredll___so_symlinks_uninst_cmd = rm -f \
@COND_PLATFORM_WIN32_1@__coredll___win32rc = coredll_version_rc.o
@COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4 =
@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4 \
-@COND_PLATFORM_WIN32_1@ = coredll_evtloop.o coredll_main.o coredll_mslu.o \
-@COND_PLATFORM_WIN32_1@ coredll_volume.o
+@COND_PLATFORM_WIN32_1@ = coredll_msw_evtloop.o coredll_msw_main.o \
+@COND_PLATFORM_WIN32_1@ coredll_mslu.o coredll_volume.o
@COND_TOOLKIT_OSX_CARBON@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_4 \
-@COND_TOOLKIT_OSX_CARBON@ = coredll_utils.o coredll_uma.o
+@COND_TOOLKIT_OSX_CARBON@ = coredll_carbon_utils.o coredll_uma.o
@COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_4 \
-@COND_TOOLKIT_OSX_COCOA@ = coredll_utils.o
+@COND_TOOLKIT_OSX_COCOA@ = coredll_osx_cocoa_utils.o
COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \
$(__LOWLEVEL_SRC_OBJECTS_4) \
$(__PLATFORM_SRC_OBJECTS_8) \
@@ -8028,55 +8094,55 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \
COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \
$(__LOWLEVEL_SRC_OBJECTS_5) \
$(__PLATFORM_SRC_OBJECTS_8) \
- coredll_accel.o \
+ coredll_generic_accel.o \
coredll_clrpickerg.o \
coredll_collpaneg.o \
coredll_colrdlgg.o \
coredll_dirdlgg.o \
- coredll_fdrepdlg.o \
+ coredll_generic_fdrepdlg.o \
coredll_filedlgg.o \
coredll_filepickerg.o \
coredll_fontdlgg.o \
coredll_fontpickerg.o \
- coredll_listctrl.o \
+ coredll_generic_listctrl.o \
coredll_mdig.o \
coredll_msgdlgg.o \
coredll_prntdlgg.o \
coredll_tabg.o \
- coredll_bmpbuttn.o \
- coredll_button.o \
- coredll_checkbox.o \
- coredll_checklst.o \
- coredll_choice.o \
- coredll_combobox.o \
- coredll_control.o \
+ coredll_univ_bmpbuttn.o \
+ coredll_univ_button.o \
+ coredll_univ_checkbox.o \
+ coredll_univ_checklst.o \
+ coredll_univ_choice.o \
+ coredll_univ_combobox.o \
+ coredll_univ_control.o \
coredll_ctrlrend.o \
- coredll_dialog.o \
+ coredll_univ_dialog.o \
coredll_framuniv.o \
- coredll_gauge.o \
+ coredll_univ_gauge.o \
coredll_inpcons.o \
coredll_inphand.o \
- coredll_listbox.o \
- coredll_menu.o \
- coredll_notebook.o \
- coredll_radiobox.o \
- coredll_radiobut.o \
+ coredll_univ_listbox.o \
+ coredll_univ_menu.o \
+ coredll_univ_notebook.o \
+ coredll_univ_radiobox.o \
+ coredll_univ_radiobut.o \
coredll_scrarrow.o \
- coredll_scrolbar.o \
+ coredll_univ_scrolbar.o \
coredll_scrthumb.o \
coredll_settingsuniv.o \
- coredll_slider.o \
- coredll_spinbutt.o \
- coredll_statbmp.o \
- coredll_statbox.o \
- coredll_statline.o \
- coredll_stattext.o \
- coredll_statusbr.o \
+ coredll_univ_slider.o \
+ coredll_univ_spinbutt.o \
+ coredll_univ_statbmp.o \
+ coredll_univ_statbox.o \
+ coredll_univ_statline.o \
+ coredll_univ_stattext.o \
+ coredll_univ_statusbr.o \
coredll_stdrend.o \
- coredll_textctrl.o \
- coredll_tglbtn.o \
+ coredll_univ_textctrl.o \
+ coredll_univ_tglbtn.o \
coredll_theme.o \
- coredll_toolbar.o \
+ coredll_univ_toolbar.o \
coredll_topluniv.o \
coredll_winuniv.o \
coredll_gtk.o \
@@ -8215,209 +8281,209 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \
@COND_TOOLKIT_COCOA@ coredll_hid.o coredll_utilsexc_cf.o
COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_4 = \
coredll_fontmgrcmn.o \
- coredll_caret.o \
- coredll_colour.o \
- coredll_icon.o \
- coredll_imaglist.o \
+ coredll_generic_caret.o \
+ coredll_generic_colour.o \
+ coredll_generic_icon.o \
+ coredll_generic_imaglist.o \
coredll_mask.o \
- coredll_timer.o \
- coredll_app.o \
- coredll_bitmap.o \
- coredll_brush.o \
- coredll_cursor.o \
- coredll_dc.o \
- coredll_dcclient.o \
- coredll_dcmemory.o \
- coredll_dcscreen.o \
- coredll_evtloop.o \
- coredll_font.o \
- coredll_fontenum.o \
- coredll_fontmgr.o \
- coredll_nonownedwnd.o \
- coredll_overlay.o \
- coredll_pen.o \
- coredll_region.o \
- coredll_settings.o \
- coredll_toplevel.o \
- coredll_utils.o \
- coredll_window.o \
+ coredll_generic_timer.o \
+ coredll_dfb_app.o \
+ coredll_dfb_bitmap.o \
+ coredll_dfb_brush.o \
+ coredll_dfb_cursor.o \
+ coredll_dfb_dc.o \
+ coredll_dfb_dcclient.o \
+ coredll_dfb_dcmemory.o \
+ coredll_dfb_dcscreen.o \
+ coredll_dfb_evtloop.o \
+ coredll_dfb_font.o \
+ coredll_dfb_fontenum.o \
+ coredll_dfb_fontmgr.o \
+ coredll_dfb_nonownedwnd.o \
+ coredll_dfb_overlay.o \
+ coredll_dfb_pen.o \
+ coredll_dfb_region.o \
+ coredll_dfb_settings.o \
+ coredll_dfb_toplevel.o \
+ coredll_dfb_utils.o \
+ coredll_dfb_window.o \
coredll_wrapdfb.o
@COND_TOOLKIT_DFB@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_4)
COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_4 = \
- coredll_caret.o \
- coredll_imaglist.o \
- coredll_dialup.o \
- coredll_fontenum.o \
- coredll_fontutil.o \
+ coredll_generic_caret.o \
+ coredll_generic_imaglist.o \
+ coredll_unix_dialup.o \
+ coredll_unix_fontenum.o \
+ coredll_unix_fontutil.o \
coredll_utilsx11.o \
coredll_displayx11.o \
- coredll_icon.o \
+ coredll_generic_icon.o \
coredll_paletteg.o \
- coredll_app.o \
- coredll_bitmap.o \
- coredll_brush.o \
- coredll_clipbrd.o \
- coredll_colour.o \
- coredll_cursor.o \
- coredll_data.o \
- coredll_dataobj.o \
- coredll_dc.o \
- coredll_dcclient.o \
- coredll_dcmemory.o \
- coredll_dcscreen.o \
- coredll_dnd.o \
- coredll_evtloop.o \
- coredll_font.o \
- coredll_gsockgtk.o \
- coredll_main.o \
- coredll_minifram.o \
- coredll_pen.o \
- coredll_popupwin.o \
- coredll_region.o \
- coredll_renderer.o \
- coredll_settings.o \
- coredll_timer.o \
- coredll_tooltip.o \
- coredll_toplevel.o \
- coredll_utilsgtk.o \
- coredll_win_gtk.o \
- coredll_window.o
+ coredll_gtk1_app.o \
+ coredll_gtk1_bitmap.o \
+ coredll_gtk1_brush.o \
+ coredll_gtk1_clipbrd.o \
+ coredll_gtk1_colour.o \
+ coredll_gtk1_cursor.o \
+ coredll_gtk1_data.o \
+ coredll_gtk1_dataobj.o \
+ coredll_gtk1_dc.o \
+ coredll_gtk1_dcclient.o \
+ coredll_gtk1_dcmemory.o \
+ coredll_gtk1_dcscreen.o \
+ coredll_gtk1_dnd.o \
+ coredll_gtk1_evtloop.o \
+ coredll_gtk1_font.o \
+ coredll_gtk1_gsockgtk.o \
+ coredll_gtk1_main.o \
+ coredll_gtk1_minifram.o \
+ coredll_gtk1_pen.o \
+ coredll_gtk1_popupwin.o \
+ coredll_gtk1_region.o \
+ coredll_gtk1_renderer.o \
+ coredll_gtk1_settings.o \
+ coredll_gtk1_timer.o \
+ coredll_gtk1_tooltip.o \
+ coredll_gtk1_toplevel.o \
+ coredll_gtk1_utilsgtk.o \
+ coredll_gtk1_win_gtk.o \
+ coredll_gtk1_window.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_4)
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_4 = \
- coredll_caret.o \
- coredll_imaglist.o \
- coredll_dialup.o \
- coredll_fontenum.o \
- coredll_fontutil.o \
+ coredll_generic_caret.o \
+ coredll_generic_imaglist.o \
+ coredll_unix_dialup.o \
+ coredll_unix_fontenum.o \
+ coredll_unix_fontutil.o \
coredll_utilsx11.o \
coredll_displayx11.o \
- coredll_icon.o \
+ coredll_generic_icon.o \
coredll_paletteg.o \
- coredll_app.o \
+ coredll_gtk_app.o \
coredll_assertdlg_gtk.o \
- coredll_bitmap.o \
- coredll_brush.o \
- coredll_clipbrd.o \
- coredll_colour.o \
- coredll_cursor.o \
- coredll_dataobj.o \
- coredll_dc.o \
- coredll_dcclient.o \
- coredll_dcmemory.o \
- coredll_dcscreen.o \
- coredll_dnd.o \
- coredll_evtloop.o \
+ coredll_gtk_bitmap.o \
+ coredll_gtk_brush.o \
+ coredll_gtk_clipbrd.o \
+ coredll_gtk_colour.o \
+ coredll_gtk_cursor.o \
+ coredll_gtk_dataobj.o \
+ coredll_gtk_dc.o \
+ coredll_gtk_dcclient.o \
+ coredll_gtk_dcmemory.o \
+ coredll_gtk_dcscreen.o \
+ coredll_gtk_dnd.o \
+ coredll_gtk_evtloop.o \
coredll_filectrl.o \
- coredll_font.o \
- coredll_gsockgtk.o \
- coredll_minifram.o \
- coredll_pen.o \
- coredll_popupwin.o \
+ coredll_gtk_font.o \
+ coredll_gtk_gsockgtk.o \
+ coredll_gtk_minifram.o \
+ coredll_gtk_pen.o \
+ coredll_gtk_popupwin.o \
coredll_private.o \
- coredll_region.o \
- coredll_renderer.o \
- coredll_settings.o \
- coredll_timer.o \
- coredll_tooltip.o \
- coredll_toplevel.o \
- coredll_utilsgtk.o \
- coredll_win_gtk.o \
- coredll_window.o
+ coredll_gtk_region.o \
+ coredll_gtk_renderer.o \
+ coredll_gtk_settings.o \
+ coredll_gtk_timer.o \
+ coredll_gtk_tooltip.o \
+ coredll_gtk_toplevel.o \
+ coredll_gtk_utilsgtk.o \
+ coredll_gtk_win_gtk.o \
+ coredll_gtk_window.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_4)
COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_4 = \
coredll_fontmgrcmn.o \
- coredll_caret.o \
- coredll_colour.o \
- coredll_icon.o \
- coredll_imaglist.o \
+ coredll_generic_caret.o \
+ coredll_generic_colour.o \
+ coredll_generic_icon.o \
+ coredll_generic_imaglist.o \
coredll_mask.o \
- coredll_timer.o \
- coredll_app.o \
- coredll_bitmap.o \
- coredll_brush.o \
- coredll_clipbrd.o \
- coredll_cursor.o \
- coredll_data.o \
- coredll_dc.o \
- coredll_dcclient.o \
- coredll_dcmemory.o \
- coredll_dcscreen.o \
+ coredll_generic_timer.o \
+ coredll_mgl_app.o \
+ coredll_mgl_bitmap.o \
+ coredll_mgl_brush.o \
+ coredll_mgl_clipbrd.o \
+ coredll_mgl_cursor.o \
+ coredll_mgl_data.o \
+ coredll_mgl_dc.o \
+ coredll_mgl_dcclient.o \
+ coredll_mgl_dcmemory.o \
+ coredll_mgl_dcscreen.o \
coredll_dirmgl.o \
- coredll_evtloop.o \
- coredll_font.o \
- coredll_fontenum.o \
- coredll_fontmgr.o \
- coredll_fontutil.o \
- coredll_palette.o \
- coredll_pen.o \
- coredll_region.o \
- coredll_settings.o \
- coredll_toplevel.o \
- coredll_utils.o \
- coredll_window.o
+ coredll_mgl_evtloop.o \
+ coredll_mgl_font.o \
+ coredll_mgl_fontenum.o \
+ coredll_mgl_fontmgr.o \
+ coredll_mgl_fontutil.o \
+ coredll_mgl_palette.o \
+ coredll_mgl_pen.o \
+ coredll_mgl_region.o \
+ coredll_mgl_settings.o \
+ coredll_mgl_toplevel.o \
+ coredll_mgl_utils.o \
+ coredll_mgl_window.o
@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_4)
COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_4 = \
- coredll_caret.o \
- coredll_imaglist.o \
- coredll_dialup.o \
- coredll_fontenum.o \
- coredll_fontutil.o \
+ coredll_generic_caret.o \
+ coredll_generic_imaglist.o \
+ coredll_unix_dialup.o \
+ coredll_unix_fontenum.o \
+ coredll_unix_fontutil.o \
coredll_utilsx11.o \
coredll_displayx11.o \
- coredll_bitmap.o \
- coredll_brush.o \
- coredll_palette.o \
- coredll_pen.o \
- coredll_region.o \
+ coredll_x11_bitmap.o \
+ coredll_x11_brush.o \
+ coredll_x11_palette.o \
+ coredll_x11_pen.o \
+ coredll_x11_region.o \
coredll_utilsx.o
@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_4)
COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 = \
- coredll_app.o \
- coredll_bitmap.o \
- coredll_brush.o \
- coredll_caret.o \
- coredll_clipbrd.o \
- coredll_colour.o \
- coredll_cursor.o \
- coredll_data.o \
- coredll_dc.o \
- coredll_dcclient.o \
- coredll_dcmemory.o \
- coredll_dcprint.o \
- coredll_dcscreen.o \
- coredll_dialup.o \
+ coredll_msw_app.o \
+ coredll_msw_bitmap.o \
+ coredll_msw_brush.o \
+ coredll_msw_caret.o \
+ coredll_msw_clipbrd.o \
+ coredll_msw_colour.o \
+ coredll_msw_cursor.o \
+ coredll_msw_data.o \
+ coredll_msw_dc.o \
+ coredll_msw_dcclient.o \
+ coredll_msw_dcmemory.o \
+ coredll_msw_dcprint.o \
+ coredll_msw_dcscreen.o \
+ coredll_msw_dialup.o \
coredll_dib.o \
- coredll_display.o \
+ coredll_msw_display.o \
coredll_enhmeta.o \
- coredll_font.o \
- coredll_fontenum.o \
- coredll_fontutil.o \
- coredll_gdiimage.o \
- coredll_gdiobj.o \
+ coredll_msw_font.o \
+ coredll_msw_fontenum.o \
+ coredll_msw_fontutil.o \
+ coredll_msw_gdiimage.o \
+ coredll_msw_gdiobj.o \
coredll_gdiplus.o \
- coredll_graphics.o \
- coredll_icon.o \
- coredll_imaglist.o \
- coredll_minifram.o \
- coredll_dataobj.o \
+ coredll_msw_graphics.o \
+ coredll_msw_icon.o \
+ coredll_msw_imaglist.o \
+ coredll_msw_minifram.o \
+ coredll_ole_dataobj.o \
coredll_dropsrc.o \
coredll_droptgt.o \
coredll_oleutils.o \
- coredll_palette.o \
- coredll_pen.o \
- coredll_popupwin.o \
- coredll_printdlg.o \
+ coredll_msw_palette.o \
+ coredll_msw_pen.o \
+ coredll_msw_popupwin.o \
+ coredll_msw_printdlg.o \
coredll_printwin.o \
- coredll_region.o \
- coredll_renderer.o \
- coredll_settings.o \
- coredll_tooltip.o \
- coredll_toplevel.o \
- coredll_utilsgui.o \
+ coredll_msw_region.o \
+ coredll_msw_renderer.o \
+ coredll_msw_settings.o \
+ coredll_msw_tooltip.o \
+ coredll_msw_toplevel.o \
+ coredll_msw_utilsgui.o \
coredll_uxtheme.o \
- coredll_window.o \
+ coredll_msw_window.o \
coredll_helpchm.o \
- coredll_helpwin.o \
+ coredll_msw_helpwin.o \
coredll_automtn.o \
coredll_uuid.o
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4)
@@ -8427,87 +8493,87 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 = \
@COND_TOOLKIT_OSX_COCOA@ $(__OSX_LOWLEVEL_SRC_OBJECTS_1_1)
@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_4 =
COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_4 = \
- coredll_app.o \
- coredll_bitmap.o \
- coredll_brush.o \
- coredll_caret.o \
- coredll_clipbrd.o \
- coredll_colour.o \
- coredll_cursor.o \
- coredll_data.o \
- coredll_dc.o \
- coredll_dcclient.o \
- coredll_dcmemory.o \
- coredll_dcprint.o \
- coredll_dcscreen.o \
- coredll_dialup.o \
+ coredll_msw_app.o \
+ coredll_msw_bitmap.o \
+ coredll_msw_brush.o \
+ coredll_msw_caret.o \
+ coredll_msw_clipbrd.o \
+ coredll_msw_colour.o \
+ coredll_msw_cursor.o \
+ coredll_msw_data.o \
+ coredll_msw_dc.o \
+ coredll_msw_dcclient.o \
+ coredll_msw_dcmemory.o \
+ coredll_msw_dcprint.o \
+ coredll_msw_dcscreen.o \
+ coredll_msw_dialup.o \
coredll_dib.o \
- coredll_display.o \
+ coredll_msw_display.o \
coredll_enhmeta.o \
- coredll_font.o \
- coredll_fontenum.o \
- coredll_fontutil.o \
- coredll_gdiimage.o \
- coredll_gdiobj.o \
+ coredll_msw_font.o \
+ coredll_msw_fontenum.o \
+ coredll_msw_fontutil.o \
+ coredll_msw_gdiimage.o \
+ coredll_msw_gdiobj.o \
coredll_gdiplus.o \
- coredll_graphics.o \
- coredll_icon.o \
- coredll_imaglist.o \
- coredll_minifram.o \
- coredll_dataobj.o \
+ coredll_msw_graphics.o \
+ coredll_msw_icon.o \
+ coredll_msw_imaglist.o \
+ coredll_msw_minifram.o \
+ coredll_ole_dataobj.o \
coredll_dropsrc.o \
coredll_droptgt.o \
coredll_oleutils.o \
- coredll_palette.o \
- coredll_pen.o \
- coredll_popupwin.o \
- coredll_printdlg.o \
+ coredll_msw_palette.o \
+ coredll_msw_pen.o \
+ coredll_msw_popupwin.o \
+ coredll_msw_printdlg.o \
coredll_printwin.o \
- coredll_region.o \
- coredll_renderer.o \
- coredll_settings.o \
- coredll_tooltip.o \
- coredll_toplevel.o \
- coredll_utilsgui.o \
+ coredll_msw_region.o \
+ coredll_msw_renderer.o \
+ coredll_msw_settings.o \
+ coredll_msw_tooltip.o \
+ coredll_msw_toplevel.o \
+ coredll_msw_utilsgui.o \
coredll_uxtheme.o \
- coredll_window.o
+ coredll_msw_window.o
@COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_4)
COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_4 = \
- coredll_caret.o \
- coredll_imaglist.o \
- coredll_dialup.o \
- coredll_fontenum.o \
- coredll_fontutil.o \
+ coredll_generic_caret.o \
+ coredll_generic_imaglist.o \
+ coredll_unix_dialup.o \
+ coredll_unix_fontenum.o \
+ coredll_unix_fontutil.o \
coredll_utilsx11.o \
coredll_displayx11.o \
- coredll_icon.o \
- coredll_timer.o \
- coredll_app.o \
- coredll_bitmap.o \
- coredll_brush.o \
- coredll_clipbrd.o \
- coredll_colour.o \
- coredll_cursor.o \
- coredll_data.o \
- coredll_dataobj.o \
- coredll_dc.o \
- coredll_dcclient.o \
- coredll_dcmemory.o \
- coredll_dcscreen.o \
- coredll_evtloop.o \
- coredll_font.o \
- coredll_minifram.o \
+ coredll_generic_icon.o \
+ coredll_generic_timer.o \
+ coredll_x11_app.o \
+ coredll_x11_bitmap.o \
+ coredll_x11_brush.o \
+ coredll_x11_clipbrd.o \
+ coredll_x11_colour.o \
+ coredll_x11_cursor.o \
+ coredll_x11_data.o \
+ coredll_x11_dataobj.o \
+ coredll_x11_dc.o \
+ coredll_x11_dcclient.o \
+ coredll_x11_dcmemory.o \
+ coredll_x11_dcscreen.o \
+ coredll_x11_evtloop.o \
+ coredll_x11_font.o \
+ coredll_x11_minifram.o \
coredll_nanox.o \
- coredll_palette.o \
- coredll_pen.o \
- coredll_popupwin.o \
- coredll_region.o \
+ coredll_x11_palette.o \
+ coredll_x11_pen.o \
+ coredll_x11_popupwin.o \
+ coredll_x11_region.o \
coredll_reparent.o \
- coredll_settings.o \
- coredll_toplevel.o \
- coredll_utils.o \
+ coredll_x11_settings.o \
+ coredll_x11_toplevel.o \
+ coredll_x11_utils.o \
coredll_utilsx.o \
- coredll_window.o
+ coredll_x11_window.o
@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_4)
COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 = \
coredll_NSBox.o \
@@ -8523,256 +8589,256 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 = \
coredll_NSView.o \
coredll_NSWindow.o \
coredll_ObjcRef.o \
- coredll_app.o \
- coredll_bitmap.o \
- coredll_bmpbuttn.o \
- coredll_brush.o \
- coredll_button.o \
- coredll_checkbox.o \
- coredll_checklst.o \
- coredll_choice.o \
- coredll_clipbrd.o \
- coredll_colordlg.o \
- coredll_colour.o \
- coredll_combobox.o \
- coredll_control.o \
- coredll_cursor.o \
- coredll_data.o \
- coredll_dataobj.o \
- coredll_dc.o \
- coredll_dcclient.o \
- coredll_dcmemory.o \
- coredll_dcscreen.o \
- coredll_dialog.o \
- coredll_dirdlg.o \
- coredll_display.o \
+ coredll_cocoa_app.o \
+ coredll_cocoa_bitmap.o \
+ coredll_src_cocoa_bmpbuttn.o \
+ coredll_cocoa_brush.o \
+ coredll_src_cocoa_button.o \
+ coredll_src_cocoa_checkbox.o \
+ coredll_cocoa_checklst.o \
+ coredll_src_cocoa_choice.o \
+ coredll_cocoa_clipbrd.o \
+ coredll_cocoa_colordlg.o \
+ coredll_cocoa_colour.o \
+ coredll_cocoa_combobox.o \
+ coredll_cocoa_control.o \
+ coredll_cocoa_cursor.o \
+ coredll_cocoa_data.o \
+ coredll_cocoa_dataobj.o \
+ coredll_cocoa_dc.o \
+ coredll_cocoa_dcclient.o \
+ coredll_cocoa_dcmemory.o \
+ coredll_cocoa_dcscreen.o \
+ coredll_src_cocoa_dialog.o \
+ coredll_src_cocoa_dirdlg.o \
+ coredll_cocoa_display.o \
coredll_drawer.o \
- coredll_evtloop.o \
- coredll_filedlg.o \
- coredll_font.o \
- coredll_fontdlg.o \
- coredll_fontenum.o \
- coredll_fontutil.o \
- coredll_frame.o \
- coredll_gauge.o \
- coredll_icon.o \
- coredll_listbox.o \
- coredll_main.o \
+ coredll_src_cocoa_evtloop.o \
+ coredll_src_cocoa_filedlg.o \
+ coredll_cocoa_font.o \
+ coredll_cocoa_fontdlg.o \
+ coredll_cocoa_fontenum.o \
+ coredll_cocoa_fontutil.o \
+ coredll_cocoa_frame.o \
+ coredll_src_cocoa_gauge.o \
+ coredll_cocoa_icon.o \
+ coredll_src_cocoa_listbox.o \
+ coredll_cocoa_main.o \
coredll_mbarman.o \
- coredll_mdi.o \
- coredll_menu.o \
- coredll_menuitem.o \
- coredll_msgdlg.o \
- coredll_notebook.o \
- coredll_pen.o \
- coredll_radiobox.o \
- coredll_radiobut.o \
- coredll_region.o \
- coredll_scrolbar.o \
- coredll_settings.o \
- coredll_slider.o \
+ coredll_cocoa_mdi.o \
+ coredll_src_cocoa_menu.o \
+ coredll_src_cocoa_menuitem.o \
+ coredll_src_cocoa_msgdlg.o \
+ coredll_src_cocoa_notebook.o \
+ coredll_cocoa_pen.o \
+ coredll_cocoa_radiobox.o \
+ coredll_src_cocoa_radiobut.o \
+ coredll_cocoa_region.o \
+ coredll_src_cocoa_scrolbar.o \
+ coredll_cocoa_settings.o \
+ coredll_src_cocoa_slider.o \
coredll_sound.o \
- coredll_spinbutt.o \
- coredll_statbmp.o \
- coredll_statbox.o \
+ coredll_src_cocoa_spinbutt.o \
+ coredll_cocoa_statbmp.o \
+ coredll_src_cocoa_statbox.o \
coredll_statline2.o \
- coredll_stattext.o \
- coredll_textctrl.o \
- coredll_timer.o \
- coredll_toolbar.o \
- coredll_tooltip.o \
- coredll_toplevel.o \
- coredll_utils.o \
+ coredll_src_cocoa_stattext.o \
+ coredll_src_cocoa_textctrl.o \
+ coredll_cocoa_timer.o \
+ coredll_src_cocoa_toolbar.o \
+ coredll_src_cocoa_tooltip.o \
+ coredll_cocoa_toplevel.o \
+ coredll_src_cocoa_utils.o \
coredll_utilsexc.o \
- coredll_window.o \
- coredll_accel.o \
- coredll_caret.o \
+ coredll_src_cocoa_window.o \
+ coredll_generic_accel.o \
+ coredll_generic_caret.o \
coredll_clrpickerg.o \
coredll_collpaneg.o \
coredll_colrdlgg.o \
- coredll_fdrepdlg.o \
+ coredll_generic_fdrepdlg.o \
coredll_filepickerg.o \
coredll_fontdlgg.o \
coredll_fontpickerg.o \
- coredll_imaglist.o \
- coredll_listctrl.o \
+ coredll_generic_imaglist.o \
+ coredll_generic_listctrl.o \
coredll_msgdlgg.o \
coredll_paletteg.o \
coredll_regiong.o \
- coredll_statusbr.o \
+ coredll_generic_statusbr.o \
coredll_tabg.o
@COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2)
COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_2 = \
- coredll_accel.o \
+ coredll_generic_accel.o \
coredll_clrpickerg.o \
coredll_collpaneg.o \
coredll_colrdlgg.o \
coredll_dirdlgg.o \
- coredll_fdrepdlg.o \
+ coredll_generic_fdrepdlg.o \
coredll_filedlgg.o \
coredll_filepickerg.o \
coredll_fontdlgg.o \
coredll_fontpickerg.o \
- coredll_listctrl.o \
+ coredll_generic_listctrl.o \
coredll_msgdlgg.o \
coredll_prntdlgg.o \
- coredll_statusbr.o \
+ coredll_generic_statusbr.o \
coredll_tabg.o \
- coredll_bmpbuttn.o \
- coredll_button.o \
- coredll_checkbox.o \
- coredll_checklst.o \
- coredll_choice.o \
- coredll_combobox.o \
- coredll_control.o \
- coredll_dialog.o \
- coredll_filedlg.o \
- coredll_fontdlg.o \
- coredll_frame.o \
- coredll_gauge.o \
- coredll_listbox.o \
- coredll_mdi.o \
- coredll_menu.o \
- coredll_notebook.o \
- coredll_radiobox.o \
- coredll_radiobut.o \
- coredll_scrolbar.o \
- coredll_scrolwin.o \
- coredll_slider.o \
- coredll_spinbutt.o \
- coredll_spinctrl.o \
- coredll_statbmp.o \
- coredll_statbox.o \
- coredll_statline.o \
- coredll_stattext.o \
- coredll_tbargtk.o \
- coredll_textctrl.o \
- coredll_tglbtn.o
+ coredll_gtk1_bmpbuttn.o \
+ coredll_gtk1_button.o \
+ coredll_gtk1_checkbox.o \
+ coredll_gtk1_checklst.o \
+ coredll_gtk1_choice.o \
+ coredll_gtk1_combobox.o \
+ coredll_gtk1_control.o \
+ coredll_gtk1_dialog.o \
+ coredll_gtk1_filedlg.o \
+ coredll_gtk1_fontdlg.o \
+ coredll_gtk1_frame.o \
+ coredll_gtk1_gauge.o \
+ coredll_gtk1_listbox.o \
+ coredll_gtk1_mdi.o \
+ coredll_gtk1_menu.o \
+ coredll_gtk1_notebook.o \
+ coredll_gtk1_radiobox.o \
+ coredll_gtk1_radiobut.o \
+ coredll_gtk1_scrolbar.o \
+ coredll_gtk1_scrolwin.o \
+ coredll_gtk1_slider.o \
+ coredll_gtk1_spinbutt.o \
+ coredll_gtk1_spinctrl.o \
+ coredll_gtk1_statbmp.o \
+ coredll_gtk1_statbox.o \
+ coredll_gtk1_statline.o \
+ coredll_gtk1_stattext.o \
+ coredll_gtk1_tbargtk.o \
+ coredll_gtk1_textctrl.o \
+ coredll_gtk1_tglbtn.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_2)
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_2 = \
- coredll_accel.o \
- coredll_fdrepdlg.o \
+ coredll_generic_accel.o \
+ coredll_generic_fdrepdlg.o \
coredll_filepickerg.o \
coredll_graphicc.o \
- coredll_listctrl.o \
+ coredll_generic_listctrl.o \
coredll_prntdlgg.o \
- coredll_statusbr.o \
+ coredll_generic_statusbr.o \
coredll_tabg.o \
coredll_fontdlgg.o \
coredll_msgdlgg.o \
coredll_artgtk.o \
- coredll_bmpbuttn.o \
- coredll_button.o \
- coredll_checkbox.o \
- coredll_checklst.o \
- coredll_choice.o \
+ coredll_gtk_bmpbuttn.o \
+ coredll_gtk_button.o \
+ coredll_gtk_checkbox.o \
+ coredll_gtk_checklst.o \
+ coredll_gtk_choice.o \
coredll_collpane.o \
- coredll_colordlg.o \
- coredll_combobox.o \
- coredll_control.o \
+ coredll_gtk_colordlg.o \
+ coredll_gtk_combobox.o \
+ coredll_gtk_control.o \
coredll_clrpicker.o \
- coredll_dialog.o \
+ coredll_gtk_dialog.o \
coredll_fontpicker.o \
coredll_filepicker.o \
- coredll_dirdlg.o \
- coredll_filedlg.o \
- coredll_fontdlg.o \
- coredll_frame.o \
- coredll_gauge.o \
+ coredll_gtk_dirdlg.o \
+ coredll_gtk_filedlg.o \
+ coredll_gtk_fontdlg.o \
+ coredll_gtk_frame.o \
+ coredll_gtk_gauge.o \
coredll_gprint.o \
coredll_gvfs.o \
- coredll_print.o \
- coredll_listbox.o \
- coredll_mdi.o \
- coredll_menu.o \
+ coredll_gtk_print.o \
+ coredll_gtk_listbox.o \
+ coredll_gtk_mdi.o \
+ coredll_gtk_menu.o \
coredll_mnemonics.o \
- coredll_msgdlg.o \
- coredll_nativewin.o \
- coredll_notebook.o \
- coredll_radiobox.o \
- coredll_radiobut.o \
- coredll_scrolbar.o \
- coredll_scrolwin.o \
- coredll_slider.o \
- coredll_spinbutt.o \
- coredll_spinctrl.o \
- coredll_statbmp.o \
- coredll_statbox.o \
- coredll_statline.o \
- coredll_stattext.o \
- coredll_tbargtk.o \
- coredll_textctrl.o \
- coredll_textentry.o \
- coredll_tglbtn.o \
+ coredll_gtk_msgdlg.o \
+ coredll_gtk_nativewin.o \
+ coredll_gtk_notebook.o \
+ coredll_gtk_radiobox.o \
+ coredll_gtk_radiobut.o \
+ coredll_gtk_scrolbar.o \
+ coredll_gtk_scrolwin.o \
+ coredll_gtk_slider.o \
+ coredll_gtk_spinbutt.o \
+ coredll_gtk_spinctrl.o \
+ coredll_gtk_statbmp.o \
+ coredll_gtk_statbox.o \
+ coredll_gtk_statline.o \
+ coredll_gtk_stattext.o \
+ coredll_gtk_tbargtk.o \
+ coredll_gtk_textctrl.o \
+ coredll_gtk_textentry.o \
+ coredll_gtk_tglbtn.o \
coredll_treeentry_gtk.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_2)
COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2 = \
- coredll_accel.o \
- coredll_app.o \
- coredll_bmpbuttn.o \
+ coredll_motif_accel.o \
+ coredll_motif_app.o \
+ coredll_motif_bmpbuttn.o \
coredll_bmpmotif.o \
- coredll_button.o \
- coredll_checkbox.o \
- coredll_checklst.o \
- coredll_choice.o \
- coredll_clipbrd.o \
- coredll_colour.o \
- coredll_combobox.o \
+ coredll_motif_button.o \
+ coredll_motif_checkbox.o \
+ coredll_motif_checklst.o \
+ coredll_motif_choice.o \
+ coredll_motif_clipbrd.o \
+ coredll_motif_colour.o \
+ coredll_motif_combobox.o \
coredll_combobox_native.o \
- coredll_control.o \
- coredll_cursor.o \
- coredll_data.o \
- coredll_dataobj.o \
- coredll_dc.o \
- coredll_dcclient.o \
- coredll_dcmemory.o \
- coredll_dcscreen.o \
- coredll_dialog.o \
- coredll_evtloop.o \
- coredll_filedlg.o \
- coredll_font.o \
- coredll_frame.o \
- coredll_gauge.o \
+ coredll_motif_control.o \
+ coredll_motif_cursor.o \
+ coredll_motif_data.o \
+ coredll_motif_dataobj.o \
+ coredll_motif_dc.o \
+ coredll_motif_dcclient.o \
+ coredll_motif_dcmemory.o \
+ coredll_motif_dcscreen.o \
+ coredll_motif_dialog.o \
+ coredll_motif_evtloop.o \
+ coredll_motif_filedlg.o \
+ coredll_motif_font.o \
+ coredll_motif_frame.o \
+ coredll_motif_gauge.o \
coredll_gsockmot.o \
- coredll_icon.o \
- coredll_listbox.o \
- coredll_main.o \
- coredll_mdi.o \
- coredll_menu.o \
- coredll_menuitem.o \
- coredll_minifram.o \
- coredll_msgdlg.o \
- coredll_popupwin.o \
- coredll_radiobox.o \
- coredll_radiobut.o \
- coredll_scrolbar.o \
- coredll_settings.o \
- coredll_slider.o \
- coredll_spinbutt.o \
- coredll_statbmp.o \
- coredll_statbox.o \
- coredll_stattext.o \
- coredll_textctrl.o \
- coredll_textentry.o \
- coredll_timer.o \
- coredll_toolbar.o \
- coredll_toplevel.o \
- coredll_utils.o \
- coredll_window.o \
+ coredll_motif_icon.o \
+ coredll_motif_listbox.o \
+ coredll_motif_main.o \
+ coredll_motif_mdi.o \
+ coredll_motif_menu.o \
+ coredll_motif_menuitem.o \
+ coredll_motif_minifram.o \
+ coredll_motif_msgdlg.o \
+ coredll_motif_popupwin.o \
+ coredll_motif_radiobox.o \
+ coredll_motif_radiobut.o \
+ coredll_motif_scrolbar.o \
+ coredll_motif_settings.o \
+ coredll_motif_slider.o \
+ coredll_motif_spinbutt.o \
+ coredll_motif_statbmp.o \
+ coredll_motif_statbox.o \
+ coredll_motif_stattext.o \
+ coredll_motif_textctrl.o \
+ coredll_motif_textentry.o \
+ coredll_motif_timer.o \
+ coredll_motif_toolbar.o \
+ coredll_motif_toplevel.o \
+ coredll_motif_utils.o \
+ coredll_motif_window.o \
coredll_xmcombo.o \
coredll_clrpickerg.o \
coredll_collpaneg.o \
coredll_colrdlgg.o \
coredll_dirdlgg.o \
- coredll_fdrepdlg.o \
+ coredll_generic_fdrepdlg.o \
coredll_filepickerg.o \
coredll_fontdlgg.o \
coredll_fontpickerg.o \
- coredll_listctrl.o \
- coredll_notebook.o \
+ coredll_generic_listctrl.o \
+ coredll_generic_notebook.o \
coredll_prntdlgg.o \
- coredll_statline.o \
- coredll_statusbr.o \
+ coredll_generic_statline.o \
+ coredll_generic_statusbr.o \
coredll_tabg.o
@COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2)
COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \
@@ -8780,291 +8846,291 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \
coredll_collpaneg.o \
coredll_filepickerg.o \
coredll_fontpickerg.o \
- coredll_statusbr.o \
+ coredll_generic_statusbr.o \
coredll_prntdlgg.o \
- coredll_accel.o \
- coredll_bmpbuttn.o \
- coredll_button.o \
- coredll_checkbox.o \
- coredll_choice.o \
- coredll_colordlg.o \
+ coredll_msw_accel.o \
+ coredll_msw_bmpbuttn.o \
+ coredll_msw_button.o \
+ coredll_msw_checkbox.o \
+ coredll_msw_choice.o \
+ coredll_msw_colordlg.o \
coredll_combo.o \
- coredll_combobox.o \
- coredll_control.o \
- coredll_dialog.o \
- coredll_dirdlg.o \
+ coredll_msw_combobox.o \
+ coredll_msw_control.o \
+ coredll_msw_dialog.o \
+ coredll_msw_dirdlg.o \
coredll_dragimag.o \
- coredll_filedlg.o \
- coredll_frame.o \
- coredll_gauge.o \
- coredll_iniconf.o \
- coredll_listbox.o \
- coredll_listctrl.o \
- coredll_mdi.o \
- coredll_menu.o \
- coredll_menuitem.o \
- coredll_metafile.o \
- coredll_msgdlg.o \
- coredll_nativdlg.o \
- coredll_nativewin.o \
- coredll_notebook.o \
+ coredll_msw_filedlg.o \
+ coredll_msw_frame.o \
+ coredll_msw_gauge.o \
+ coredll_msw_iniconf.o \
+ coredll_msw_listbox.o \
+ coredll_msw_listctrl.o \
+ coredll_msw_mdi.o \
+ coredll_msw_menu.o \
+ coredll_msw_menuitem.o \
+ coredll_msw_metafile.o \
+ coredll_msw_msgdlg.o \
+ coredll_msw_nativdlg.o \
+ coredll_msw_nativewin.o \
+ coredll_msw_notebook.o \
coredll_access.o \
- coredll_ownerdrw.o \
- coredll_radiobox.o \
- coredll_radiobut.o \
- coredll_scrolbar.o \
- coredll_slider.o \
- coredll_spinbutt.o \
- coredll_spinctrl.o \
- coredll_statbmp.o \
- coredll_statbox.o \
+ coredll_msw_ownerdrw.o \
+ coredll_msw_radiobox.o \
+ coredll_msw_radiobut.o \
+ coredll_msw_scrolbar.o \
+ coredll_msw_slider.o \
+ coredll_msw_spinbutt.o \
+ coredll_msw_spinctrl.o \
+ coredll_msw_statbmp.o \
+ coredll_msw_statbox.o \
coredll_statusbar.o \
- coredll_statline.o \
- coredll_stattext.o \
- coredll_tabctrl.o \
- coredll_toolbar.o \
- coredll_textctrl.o \
- coredll_textentry.o \
- coredll_tglbtn.o \
+ coredll_msw_statline.o \
+ coredll_msw_stattext.o \
+ coredll_msw_tabctrl.o \
+ coredll_msw_toolbar.o \
+ coredll_msw_textctrl.o \
+ coredll_msw_textentry.o \
+ coredll_msw_tglbtn.o \
coredll_treectrl.o \
- coredll_checklst.o \
- coredll_fdrepdlg.o \
- coredll_fontdlg.o
+ coredll_msw_checklst.o \
+ coredll_msw_fdrepdlg.o \
+ coredll_msw_fontdlg.o
@COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2)
COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS_2 = \
$(__OSX_CARBON_COCOA_SRC_OBJECTS_8) \
- coredll_bmpbuttn.o \
- coredll_button.o \
- coredll_checkbox.o \
- coredll_choice.o \
- coredll_colordlg.o \
- coredll_dialog.o \
- coredll_dirdlg.o \
- coredll_evtloop.o \
- coredll_filedlg.o \
- coredll_gauge.o \
- coredll_listbox.o \
+ coredll_carbon_bmpbuttn.o \
+ coredll_carbon_button.o \
+ coredll_carbon_checkbox.o \
+ coredll_carbon_choice.o \
+ coredll_carbon_colordlg.o \
+ coredll_carbon_dialog.o \
+ coredll_carbon_dirdlg.o \
+ coredll_carbon_evtloop.o \
+ coredll_carbon_filedlg.o \
+ coredll_carbon_gauge.o \
+ coredll_carbon_listbox.o \
coredll_listctrl_mac.o \
- coredll_menu.o \
- coredll_menuitem.o \
- coredll_msgdlg.o \
- coredll_nonownedwnd.o \
+ coredll_carbon_menu.o \
+ coredll_carbon_menuitem.o \
+ coredll_carbon_msgdlg.o \
+ coredll_carbon_nonownedwnd.o \
coredll_notebmac.o \
- coredll_radiobut.o \
- coredll_region.o \
- coredll_scrolbar.o \
- coredll_slider.o \
- coredll_spinbutt.o \
- coredll_srchctrl.o \
- coredll_statbmp.o \
- coredll_statbox.o \
+ coredll_carbon_radiobut.o \
+ coredll_carbon_region.o \
+ coredll_carbon_scrolbar.o \
+ coredll_carbon_slider.o \
+ coredll_carbon_spinbutt.o \
+ coredll_carbon_srchctrl.o \
+ coredll_carbon_statbmp.o \
+ coredll_carbon_statbox.o \
coredll_statlmac.o \
- coredll_stattext.o \
- coredll_textctrl.o \
- coredll_tglbtn.o \
- coredll_toolbar.o \
- coredll_tooltip.o \
- coredll_window.o \
+ coredll_carbon_stattext.o \
+ coredll_carbon_textctrl.o \
+ coredll_carbon_tglbtn.o \
+ coredll_carbon_toolbar.o \
+ coredll_carbon_tooltip.o \
+ coredll_carbon_window.o \
coredll_webkit.o \
- coredll_caret.o \
+ coredll_generic_caret.o \
coredll_clrpickerg.o \
coredll_collpaneg.o \
- coredll_fdrepdlg.o \
+ coredll_generic_fdrepdlg.o \
coredll_filepickerg.o \
coredll_fontdlgg.o \
coredll_fontpickerg.o \
- coredll_listctrl.o \
+ coredll_generic_listctrl.o \
coredll_prntdlgg.o \
- coredll_statusbr.o \
+ coredll_generic_statusbr.o \
coredll_tabg.o
@COND_TOOLKIT_OSX_CARBON@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS_2)
COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_2 = \
$(__OSX_CARBON_COCOA_SRC_OBJECTS_8) \
- coredll_bmpbuttn.o \
- coredll_button.o \
- coredll_checkbox.o \
- coredll_choice.o \
- coredll_dialog.o \
- coredll_dirdlg.o \
- coredll_evtloop.o \
- coredll_filedlg.o \
- coredll_gauge.o \
- coredll_listbox.o \
- coredll_menu.o \
- coredll_menuitem.o \
- coredll_msgdlg.o \
- coredll_nonownedwnd.o \
- coredll_notebook.o \
- coredll_radiobut.o \
- coredll_scrolbar.o \
- coredll_slider.o \
- coredll_spinbutt.o \
- coredll_srchctrl.o \
- coredll_statbox.o \
- coredll_statline.o \
- coredll_stattext.o \
- coredll_textctrl.o \
- coredll_tglbtn.o \
- coredll_toolbar.o \
- coredll_tooltip.o \
- coredll_window.o \
- coredll_caret.o \
+ coredll_osx_cocoa_bmpbuttn.o \
+ coredll_osx_cocoa_button.o \
+ coredll_osx_cocoa_checkbox.o \
+ coredll_osx_cocoa_choice.o \
+ coredll_osx_cocoa_dialog.o \
+ coredll_osx_cocoa_dirdlg.o \
+ coredll_osx_cocoa_evtloop.o \
+ coredll_osx_cocoa_filedlg.o \
+ coredll_osx_cocoa_gauge.o \
+ coredll_osx_cocoa_listbox.o \
+ coredll_osx_cocoa_menu.o \
+ coredll_osx_cocoa_menuitem.o \
+ coredll_osx_cocoa_msgdlg.o \
+ coredll_cocoa_nonownedwnd.o \
+ coredll_osx_cocoa_notebook.o \
+ coredll_osx_cocoa_radiobut.o \
+ coredll_osx_cocoa_scrolbar.o \
+ coredll_osx_cocoa_slider.o \
+ coredll_osx_cocoa_spinbutt.o \
+ coredll_cocoa_srchctrl.o \
+ coredll_osx_cocoa_statbox.o \
+ coredll_cocoa_statline.o \
+ coredll_osx_cocoa_stattext.o \
+ coredll_osx_cocoa_textctrl.o \
+ coredll_cocoa_tglbtn.o \
+ coredll_osx_cocoa_toolbar.o \
+ coredll_osx_cocoa_tooltip.o \
+ coredll_osx_cocoa_window.o \
+ coredll_generic_caret.o \
coredll_clrpickerg.o \
coredll_collpaneg.o \
- coredll_fdrepdlg.o \
+ coredll_generic_fdrepdlg.o \
coredll_filepickerg.o \
coredll_fontdlgg.o \
coredll_fontpickerg.o \
- coredll_listctrl.o \
+ coredll_generic_listctrl.o \
coredll_prntdlgg.o \
coredll_regiong.o \
- coredll_statusbr.o \
+ coredll_generic_statusbr.o \
coredll_tabg.o
@COND_TOOLKIT_OSX_COCOA@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_2)
COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2 = \
- coredll_caret.o \
+ coredll_generic_caret.o \
coredll_clrpickerg.o \
coredll_collpaneg.o \
coredll_colrdlgg.o \
coredll_dirdlgg.o \
- coredll_fdrepdlg.o \
+ coredll_generic_fdrepdlg.o \
coredll_filepickerg.o \
coredll_fontpickerg.o \
- coredll_imaglist.o \
- coredll_listctrl.o \
+ coredll_generic_imaglist.o \
+ coredll_generic_listctrl.o \
coredll_mdig.o \
coredll_prntdlgg.o \
- coredll_statusbr.o \
- coredll_accel.o \
- coredll_app.o \
- coredll_bitmap.o \
- coredll_bmpbuttn.o \
- coredll_brush.o \
- coredll_button.o \
- coredll_checkbox.o \
- coredll_checklst.o \
- coredll_choice.o \
- coredll_clipbrd.o \
- coredll_colour.o \
- coredll_combobox.o \
- coredll_control.o \
- coredll_cursor.o \
- coredll_data.o \
- coredll_dataobj.o \
- coredll_dc.o \
- coredll_dcclient.o \
- coredll_dcmemory.o \
- coredll_dcprint.o \
- coredll_dcscreen.o \
- coredll_dialog.o \
- coredll_dnd.o \
- coredll_evtloop.o \
- coredll_filedlg.o \
- coredll_font.o \
- coredll_fontdlg.o \
- coredll_fontenum.o \
- coredll_fontutil.o \
- coredll_frame.o \
- coredll_gauge.o \
- coredll_gdiimage.o \
+ coredll_generic_statusbr.o \
+ coredll_os2_accel.o \
+ coredll_os2_app.o \
+ coredll_os2_bitmap.o \
+ coredll_os2_bmpbuttn.o \
+ coredll_os2_brush.o \
+ coredll_os2_button.o \
+ coredll_os2_checkbox.o \
+ coredll_os2_checklst.o \
+ coredll_os2_choice.o \
+ coredll_os2_clipbrd.o \
+ coredll_os2_colour.o \
+ coredll_os2_combobox.o \
+ coredll_os2_control.o \
+ coredll_os2_cursor.o \
+ coredll_os2_data.o \
+ coredll_os2_dataobj.o \
+ coredll_os2_dc.o \
+ coredll_os2_dcclient.o \
+ coredll_os2_dcmemory.o \
+ coredll_os2_dcprint.o \
+ coredll_os2_dcscreen.o \
+ coredll_os2_dialog.o \
+ coredll_os2_dnd.o \
+ coredll_os2_evtloop.o \
+ coredll_os2_filedlg.o \
+ coredll_os2_font.o \
+ coredll_os2_fontdlg.o \
+ coredll_os2_fontenum.o \
+ coredll_os2_fontutil.o \
+ coredll_os2_frame.o \
+ coredll_os2_gauge.o \
+ coredll_os2_gdiimage.o \
coredll_gsockpm.o \
- coredll_helpwin.o \
- coredll_icon.o \
- coredll_iniconf.o \
- coredll_listbox.o \
- coredll_main.o \
- coredll_menu.o \
- coredll_menuitem.o \
- coredll_metafile.o \
- coredll_minifram.o \
- coredll_msgdlg.o \
- coredll_nativdlg.o \
- coredll_notebook.o \
- coredll_ownerdrw.o \
- coredll_palette.o \
- coredll_pen.o \
- coredll_popupwin.o \
- coredll_print.o \
- coredll_radiobox.o \
- coredll_radiobut.o \
- coredll_region.o \
- coredll_scrolbar.o \
- coredll_settings.o \
- coredll_slider.o \
- coredll_spinbutt.o \
- coredll_spinctrl.o \
- coredll_statbmp.o \
- coredll_statbox.o \
- coredll_statline.o \
- coredll_stattext.o \
- coredll_tabctrl.o \
- coredll_textctrl.o \
- coredll_textentry.o \
- coredll_tglbtn.o \
- coredll_timer.o \
- coredll_toolbar.o \
- coredll_tooltip.o \
- coredll_toplevel.o \
- coredll_utilsgui.o \
- coredll_window.o
+ coredll_os2_helpwin.o \
+ coredll_os2_icon.o \
+ coredll_os2_iniconf.o \
+ coredll_os2_listbox.o \
+ coredll_os2_main.o \
+ coredll_os2_menu.o \
+ coredll_os2_menuitem.o \
+ coredll_os2_metafile.o \
+ coredll_os2_minifram.o \
+ coredll_os2_msgdlg.o \
+ coredll_os2_nativdlg.o \
+ coredll_os2_notebook.o \
+ coredll_os2_ownerdrw.o \
+ coredll_os2_palette.o \
+ coredll_os2_pen.o \
+ coredll_os2_popupwin.o \
+ coredll_os2_print.o \
+ coredll_os2_radiobox.o \
+ coredll_os2_radiobut.o \
+ coredll_os2_region.o \
+ coredll_os2_scrolbar.o \
+ coredll_os2_settings.o \
+ coredll_os2_slider.o \
+ coredll_os2_spinbutt.o \
+ coredll_os2_spinctrl.o \
+ coredll_os2_statbmp.o \
+ coredll_os2_statbox.o \
+ coredll_os2_statline.o \
+ coredll_os2_stattext.o \
+ coredll_os2_tabctrl.o \
+ coredll_os2_textctrl.o \
+ coredll_os2_textentry.o \
+ coredll_os2_tglbtn.o \
+ coredll_os2_timer.o \
+ coredll_os2_toolbar.o \
+ coredll_os2_tooltip.o \
+ coredll_os2_toplevel.o \
+ coredll_os2_utilsgui.o \
+ coredll_os2_window.o
@COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2)
COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 = \
coredll_clrpickerg.o \
coredll_collpaneg.o \
coredll_filepickerg.o \
coredll_fontpickerg.o \
- coredll_statusbr.o \
+ coredll_generic_statusbr.o \
coredll_prntdlgg.o \
- coredll_accel.o \
- coredll_bmpbuttn.o \
- coredll_button.o \
- coredll_checkbox.o \
- coredll_choice.o \
- coredll_colordlg.o \
+ coredll_msw_accel.o \
+ coredll_msw_bmpbuttn.o \
+ coredll_msw_button.o \
+ coredll_msw_checkbox.o \
+ coredll_msw_choice.o \
+ coredll_msw_colordlg.o \
coredll_combo.o \
- coredll_combobox.o \
- coredll_control.o \
- coredll_dialog.o \
- coredll_dirdlg.o \
+ coredll_msw_combobox.o \
+ coredll_msw_control.o \
+ coredll_msw_dialog.o \
+ coredll_msw_dirdlg.o \
coredll_dragimag.o \
- coredll_filedlg.o \
- coredll_frame.o \
- coredll_gauge.o \
- coredll_iniconf.o \
- coredll_listbox.o \
- coredll_listctrl.o \
- coredll_mdi.o \
- coredll_menu.o \
- coredll_menuitem.o \
- coredll_metafile.o \
- coredll_msgdlg.o \
- coredll_nativdlg.o \
- coredll_nativewin.o \
- coredll_notebook.o \
+ coredll_msw_filedlg.o \
+ coredll_msw_frame.o \
+ coredll_msw_gauge.o \
+ coredll_msw_iniconf.o \
+ coredll_msw_listbox.o \
+ coredll_msw_listctrl.o \
+ coredll_msw_mdi.o \
+ coredll_msw_menu.o \
+ coredll_msw_menuitem.o \
+ coredll_msw_metafile.o \
+ coredll_msw_msgdlg.o \
+ coredll_msw_nativdlg.o \
+ coredll_msw_nativewin.o \
+ coredll_msw_notebook.o \
coredll_access.o \
- coredll_ownerdrw.o \
- coredll_radiobox.o \
- coredll_radiobut.o \
- coredll_scrolbar.o \
- coredll_slider.o \
- coredll_spinbutt.o \
- coredll_spinctrl.o \
- coredll_statbmp.o \
- coredll_statbox.o \
+ coredll_msw_ownerdrw.o \
+ coredll_msw_radiobox.o \
+ coredll_msw_radiobut.o \
+ coredll_msw_scrolbar.o \
+ coredll_msw_slider.o \
+ coredll_msw_spinbutt.o \
+ coredll_msw_spinctrl.o \
+ coredll_msw_statbmp.o \
+ coredll_msw_statbox.o \
coredll_statusbar.o \
- coredll_statline.o \
- coredll_stattext.o \
- coredll_tabctrl.o \
- coredll_toolbar.o \
- coredll_textctrl.o \
- coredll_textentry.o \
- coredll_tglbtn.o \
+ coredll_msw_statline.o \
+ coredll_msw_stattext.o \
+ coredll_msw_tabctrl.o \
+ coredll_msw_toolbar.o \
+ coredll_msw_textctrl.o \
+ coredll_msw_textentry.o \
+ coredll_msw_tglbtn.o \
coredll_treectrl.o \
coredll_dirdlgg.o \
- coredll_fdrepdlg.o \
+ coredll_generic_fdrepdlg.o \
coredll_filedlgg.o \
coredll_fontdlgg.o \
- coredll_checklst.o \
+ coredll_wince_checklst.o \
coredll_choicece.o \
coredll_crt.o \
coredll_filedlgwce.o \
@@ -9078,209 +9144,209 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 = \
@COND_TOOLKIT_COCOA@ coredll_hid.o coredll_utilsexc_cf.o
COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_5 = \
coredll_fontmgrcmn.o \
- coredll_caret.o \
- coredll_colour.o \
- coredll_icon.o \
- coredll_imaglist.o \
+ coredll_generic_caret.o \
+ coredll_generic_colour.o \
+ coredll_generic_icon.o \
+ coredll_generic_imaglist.o \
coredll_mask.o \
- coredll_timer.o \
- coredll_app.o \
- coredll_bitmap.o \
- coredll_brush.o \
- coredll_cursor.o \
- coredll_dc.o \
- coredll_dcclient.o \
- coredll_dcmemory.o \
- coredll_dcscreen.o \
- coredll_evtloop.o \
- coredll_font.o \
- coredll_fontenum.o \
- coredll_fontmgr.o \
- coredll_nonownedwnd.o \
- coredll_overlay.o \
- coredll_pen.o \
- coredll_region.o \
- coredll_settings.o \
- coredll_toplevel.o \
- coredll_utils.o \
- coredll_window.o \
+ coredll_generic_timer.o \
+ coredll_dfb_app.o \
+ coredll_dfb_bitmap.o \
+ coredll_dfb_brush.o \
+ coredll_dfb_cursor.o \
+ coredll_dfb_dc.o \
+ coredll_dfb_dcclient.o \
+ coredll_dfb_dcmemory.o \
+ coredll_dfb_dcscreen.o \
+ coredll_dfb_evtloop.o \
+ coredll_dfb_font.o \
+ coredll_dfb_fontenum.o \
+ coredll_dfb_fontmgr.o \
+ coredll_dfb_nonownedwnd.o \
+ coredll_dfb_overlay.o \
+ coredll_dfb_pen.o \
+ coredll_dfb_region.o \
+ coredll_dfb_settings.o \
+ coredll_dfb_toplevel.o \
+ coredll_dfb_utils.o \
+ coredll_dfb_window.o \
coredll_wrapdfb.o
@COND_TOOLKIT_DFB@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_5)
COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_5 = \
- coredll_caret.o \
- coredll_imaglist.o \
- coredll_dialup.o \
- coredll_fontenum.o \
- coredll_fontutil.o \
+ coredll_generic_caret.o \
+ coredll_generic_imaglist.o \
+ coredll_unix_dialup.o \
+ coredll_unix_fontenum.o \
+ coredll_unix_fontutil.o \
coredll_utilsx11.o \
coredll_displayx11.o \
- coredll_icon.o \
+ coredll_generic_icon.o \
coredll_paletteg.o \
- coredll_app.o \
- coredll_bitmap.o \
- coredll_brush.o \
- coredll_clipbrd.o \
- coredll_colour.o \
- coredll_cursor.o \
- coredll_data.o \
- coredll_dataobj.o \
- coredll_dc.o \
- coredll_dcclient.o \
- coredll_dcmemory.o \
- coredll_dcscreen.o \
- coredll_dnd.o \
- coredll_evtloop.o \
- coredll_font.o \
- coredll_gsockgtk.o \
- coredll_main.o \
- coredll_minifram.o \
- coredll_pen.o \
- coredll_popupwin.o \
- coredll_region.o \
- coredll_renderer.o \
- coredll_settings.o \
- coredll_timer.o \
- coredll_tooltip.o \
- coredll_toplevel.o \
- coredll_utilsgtk.o \
- coredll_win_gtk.o \
- coredll_window.o
+ coredll_gtk1_app.o \
+ coredll_gtk1_bitmap.o \
+ coredll_gtk1_brush.o \
+ coredll_gtk1_clipbrd.o \
+ coredll_gtk1_colour.o \
+ coredll_gtk1_cursor.o \
+ coredll_gtk1_data.o \
+ coredll_gtk1_dataobj.o \
+ coredll_gtk1_dc.o \
+ coredll_gtk1_dcclient.o \
+ coredll_gtk1_dcmemory.o \
+ coredll_gtk1_dcscreen.o \
+ coredll_gtk1_dnd.o \
+ coredll_gtk1_evtloop.o \
+ coredll_gtk1_font.o \
+ coredll_gtk1_gsockgtk.o \
+ coredll_gtk1_main.o \
+ coredll_gtk1_minifram.o \
+ coredll_gtk1_pen.o \
+ coredll_gtk1_popupwin.o \
+ coredll_gtk1_region.o \
+ coredll_gtk1_renderer.o \
+ coredll_gtk1_settings.o \
+ coredll_gtk1_timer.o \
+ coredll_gtk1_tooltip.o \
+ coredll_gtk1_toplevel.o \
+ coredll_gtk1_utilsgtk.o \
+ coredll_gtk1_win_gtk.o \
+ coredll_gtk1_window.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_5)
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_5 = \
- coredll_caret.o \
- coredll_imaglist.o \
- coredll_dialup.o \
- coredll_fontenum.o \
- coredll_fontutil.o \
+ coredll_generic_caret.o \
+ coredll_generic_imaglist.o \
+ coredll_unix_dialup.o \
+ coredll_unix_fontenum.o \
+ coredll_unix_fontutil.o \
coredll_utilsx11.o \
coredll_displayx11.o \
- coredll_icon.o \
+ coredll_generic_icon.o \
coredll_paletteg.o \
- coredll_app.o \
+ coredll_gtk_app.o \
coredll_assertdlg_gtk.o \
- coredll_bitmap.o \
- coredll_brush.o \
- coredll_clipbrd.o \
- coredll_colour.o \
- coredll_cursor.o \
- coredll_dataobj.o \
- coredll_dc.o \
- coredll_dcclient.o \
- coredll_dcmemory.o \
- coredll_dcscreen.o \
- coredll_dnd.o \
- coredll_evtloop.o \
+ coredll_gtk_bitmap.o \
+ coredll_gtk_brush.o \
+ coredll_gtk_clipbrd.o \
+ coredll_gtk_colour.o \
+ coredll_gtk_cursor.o \
+ coredll_gtk_dataobj.o \
+ coredll_gtk_dc.o \
+ coredll_gtk_dcclient.o \
+ coredll_gtk_dcmemory.o \
+ coredll_gtk_dcscreen.o \
+ coredll_gtk_dnd.o \
+ coredll_gtk_evtloop.o \
coredll_filectrl.o \
- coredll_font.o \
- coredll_gsockgtk.o \
- coredll_minifram.o \
- coredll_pen.o \
- coredll_popupwin.o \
+ coredll_gtk_font.o \
+ coredll_gtk_gsockgtk.o \
+ coredll_gtk_minifram.o \
+ coredll_gtk_pen.o \
+ coredll_gtk_popupwin.o \
coredll_private.o \
- coredll_region.o \
- coredll_renderer.o \
- coredll_settings.o \
- coredll_timer.o \
- coredll_tooltip.o \
- coredll_toplevel.o \
- coredll_utilsgtk.o \
- coredll_win_gtk.o \
- coredll_window.o
+ coredll_gtk_region.o \
+ coredll_gtk_renderer.o \
+ coredll_gtk_settings.o \
+ coredll_gtk_timer.o \
+ coredll_gtk_tooltip.o \
+ coredll_gtk_toplevel.o \
+ coredll_gtk_utilsgtk.o \
+ coredll_gtk_win_gtk.o \
+ coredll_gtk_window.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_5)
COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_5 = \
coredll_fontmgrcmn.o \
- coredll_caret.o \
- coredll_colour.o \
- coredll_icon.o \
- coredll_imaglist.o \
+ coredll_generic_caret.o \
+ coredll_generic_colour.o \
+ coredll_generic_icon.o \
+ coredll_generic_imaglist.o \
coredll_mask.o \
- coredll_timer.o \
- coredll_app.o \
- coredll_bitmap.o \
- coredll_brush.o \
- coredll_clipbrd.o \
- coredll_cursor.o \
- coredll_data.o \
- coredll_dc.o \
- coredll_dcclient.o \
- coredll_dcmemory.o \
- coredll_dcscreen.o \
+ coredll_generic_timer.o \
+ coredll_mgl_app.o \
+ coredll_mgl_bitmap.o \
+ coredll_mgl_brush.o \
+ coredll_mgl_clipbrd.o \
+ coredll_mgl_cursor.o \
+ coredll_mgl_data.o \
+ coredll_mgl_dc.o \
+ coredll_mgl_dcclient.o \
+ coredll_mgl_dcmemory.o \
+ coredll_mgl_dcscreen.o \
coredll_dirmgl.o \
- coredll_evtloop.o \
- coredll_font.o \
- coredll_fontenum.o \
- coredll_fontmgr.o \
- coredll_fontutil.o \
- coredll_palette.o \
- coredll_pen.o \
- coredll_region.o \
- coredll_settings.o \
- coredll_toplevel.o \
- coredll_utils.o \
- coredll_window.o
+ coredll_mgl_evtloop.o \
+ coredll_mgl_font.o \
+ coredll_mgl_fontenum.o \
+ coredll_mgl_fontmgr.o \
+ coredll_mgl_fontutil.o \
+ coredll_mgl_palette.o \
+ coredll_mgl_pen.o \
+ coredll_mgl_region.o \
+ coredll_mgl_settings.o \
+ coredll_mgl_toplevel.o \
+ coredll_mgl_utils.o \
+ coredll_mgl_window.o
@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_5)
COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_5 = \
- coredll_caret.o \
- coredll_imaglist.o \
- coredll_dialup.o \
- coredll_fontenum.o \
- coredll_fontutil.o \
+ coredll_generic_caret.o \
+ coredll_generic_imaglist.o \
+ coredll_unix_dialup.o \
+ coredll_unix_fontenum.o \
+ coredll_unix_fontutil.o \
coredll_utilsx11.o \
coredll_displayx11.o \
- coredll_bitmap.o \
- coredll_brush.o \
- coredll_palette.o \
- coredll_pen.o \
- coredll_region.o \
+ coredll_x11_bitmap.o \
+ coredll_x11_brush.o \
+ coredll_x11_palette.o \
+ coredll_x11_pen.o \
+ coredll_x11_region.o \
coredll_utilsx.o
@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_5)
COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 = \
- coredll_app.o \
- coredll_bitmap.o \
- coredll_brush.o \
- coredll_caret.o \
- coredll_clipbrd.o \
- coredll_colour.o \
- coredll_cursor.o \
- coredll_data.o \
- coredll_dc.o \
- coredll_dcclient.o \
- coredll_dcmemory.o \
- coredll_dcprint.o \
- coredll_dcscreen.o \
- coredll_dialup.o \
+ coredll_msw_app.o \
+ coredll_msw_bitmap.o \
+ coredll_msw_brush.o \
+ coredll_msw_caret.o \
+ coredll_msw_clipbrd.o \
+ coredll_msw_colour.o \
+ coredll_msw_cursor.o \
+ coredll_msw_data.o \
+ coredll_msw_dc.o \
+ coredll_msw_dcclient.o \
+ coredll_msw_dcmemory.o \
+ coredll_msw_dcprint.o \
+ coredll_msw_dcscreen.o \
+ coredll_msw_dialup.o \
coredll_dib.o \
- coredll_display.o \
+ coredll_msw_display.o \
coredll_enhmeta.o \
- coredll_font.o \
- coredll_fontenum.o \
- coredll_fontutil.o \
- coredll_gdiimage.o \
- coredll_gdiobj.o \
+ coredll_msw_font.o \
+ coredll_msw_fontenum.o \
+ coredll_msw_fontutil.o \
+ coredll_msw_gdiimage.o \
+ coredll_msw_gdiobj.o \
coredll_gdiplus.o \
- coredll_graphics.o \
- coredll_icon.o \
- coredll_imaglist.o \
- coredll_minifram.o \
- coredll_dataobj.o \
+ coredll_msw_graphics.o \
+ coredll_msw_icon.o \
+ coredll_msw_imaglist.o \
+ coredll_msw_minifram.o \
+ coredll_ole_dataobj.o \
coredll_dropsrc.o \
coredll_droptgt.o \
coredll_oleutils.o \
- coredll_palette.o \
- coredll_pen.o \
- coredll_popupwin.o \
- coredll_printdlg.o \
+ coredll_msw_palette.o \
+ coredll_msw_pen.o \
+ coredll_msw_popupwin.o \
+ coredll_msw_printdlg.o \
coredll_printwin.o \
- coredll_region.o \
- coredll_renderer.o \
- coredll_settings.o \
- coredll_tooltip.o \
- coredll_toplevel.o \
- coredll_utilsgui.o \
+ coredll_msw_region.o \
+ coredll_msw_renderer.o \
+ coredll_msw_settings.o \
+ coredll_msw_tooltip.o \
+ coredll_msw_toplevel.o \
+ coredll_msw_utilsgui.o \
coredll_uxtheme.o \
- coredll_window.o \
+ coredll_msw_window.o \
coredll_helpchm.o \
- coredll_helpwin.o \
+ coredll_msw_helpwin.o \
coredll_automtn.o \
coredll_uuid.o
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5)
@@ -9290,87 +9356,87 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 = \
@COND_TOOLKIT_OSX_COCOA@ $(__OSX_LOWLEVEL_SRC_OBJECTS_1_1)
@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_5 =
COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_5 = \
- coredll_app.o \
- coredll_bitmap.o \
- coredll_brush.o \
- coredll_caret.o \
- coredll_clipbrd.o \
- coredll_colour.o \
- coredll_cursor.o \
- coredll_data.o \
- coredll_dc.o \
- coredll_dcclient.o \
- coredll_dcmemory.o \
- coredll_dcprint.o \
- coredll_dcscreen.o \
- coredll_dialup.o \
+ coredll_msw_app.o \
+ coredll_msw_bitmap.o \
+ coredll_msw_brush.o \
+ coredll_msw_caret.o \
+ coredll_msw_clipbrd.o \
+ coredll_msw_colour.o \
+ coredll_msw_cursor.o \
+ coredll_msw_data.o \
+ coredll_msw_dc.o \
+ coredll_msw_dcclient.o \
+ coredll_msw_dcmemory.o \
+ coredll_msw_dcprint.o \
+ coredll_msw_dcscreen.o \
+ coredll_msw_dialup.o \
coredll_dib.o \
- coredll_display.o \
+ coredll_msw_display.o \
coredll_enhmeta.o \
- coredll_font.o \
- coredll_fontenum.o \
- coredll_fontutil.o \
- coredll_gdiimage.o \
- coredll_gdiobj.o \
+ coredll_msw_font.o \
+ coredll_msw_fontenum.o \
+ coredll_msw_fontutil.o \
+ coredll_msw_gdiimage.o \
+ coredll_msw_gdiobj.o \
coredll_gdiplus.o \
- coredll_graphics.o \
- coredll_icon.o \
- coredll_imaglist.o \
- coredll_minifram.o \
- coredll_dataobj.o \
+ coredll_msw_graphics.o \
+ coredll_msw_icon.o \
+ coredll_msw_imaglist.o \
+ coredll_msw_minifram.o \
+ coredll_ole_dataobj.o \
coredll_dropsrc.o \
coredll_droptgt.o \
coredll_oleutils.o \
- coredll_palette.o \
- coredll_pen.o \
- coredll_popupwin.o \
- coredll_printdlg.o \
+ coredll_msw_palette.o \
+ coredll_msw_pen.o \
+ coredll_msw_popupwin.o \
+ coredll_msw_printdlg.o \
coredll_printwin.o \
- coredll_region.o \
- coredll_renderer.o \
- coredll_settings.o \
- coredll_tooltip.o \
- coredll_toplevel.o \
- coredll_utilsgui.o \
+ coredll_msw_region.o \
+ coredll_msw_renderer.o \
+ coredll_msw_settings.o \
+ coredll_msw_tooltip.o \
+ coredll_msw_toplevel.o \
+ coredll_msw_utilsgui.o \
coredll_uxtheme.o \
- coredll_window.o
+ coredll_msw_window.o
@COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_5)
COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_5 = \
- coredll_caret.o \
- coredll_imaglist.o \
- coredll_dialup.o \
- coredll_fontenum.o \
- coredll_fontutil.o \
+ coredll_generic_caret.o \
+ coredll_generic_imaglist.o \
+ coredll_unix_dialup.o \
+ coredll_unix_fontenum.o \
+ coredll_unix_fontutil.o \
coredll_utilsx11.o \
coredll_displayx11.o \
- coredll_icon.o \
- coredll_timer.o \
- coredll_app.o \
- coredll_bitmap.o \
- coredll_brush.o \
- coredll_clipbrd.o \
- coredll_colour.o \
- coredll_cursor.o \
- coredll_data.o \
- coredll_dataobj.o \
- coredll_dc.o \
- coredll_dcclient.o \
- coredll_dcmemory.o \
- coredll_dcscreen.o \
- coredll_evtloop.o \
- coredll_font.o \
- coredll_minifram.o \
+ coredll_generic_icon.o \
+ coredll_generic_timer.o \
+ coredll_x11_app.o \
+ coredll_x11_bitmap.o \
+ coredll_x11_brush.o \
+ coredll_x11_clipbrd.o \
+ coredll_x11_colour.o \
+ coredll_x11_cursor.o \
+ coredll_x11_data.o \
+ coredll_x11_dataobj.o \
+ coredll_x11_dc.o \
+ coredll_x11_dcclient.o \
+ coredll_x11_dcmemory.o \
+ coredll_x11_dcscreen.o \
+ coredll_x11_evtloop.o \
+ coredll_x11_font.o \
+ coredll_x11_minifram.o \
coredll_nanox.o \
- coredll_palette.o \
- coredll_pen.o \
- coredll_popupwin.o \
- coredll_region.o \
+ coredll_x11_palette.o \
+ coredll_x11_pen.o \
+ coredll_x11_popupwin.o \
+ coredll_x11_region.o \
coredll_reparent.o \
- coredll_settings.o \
- coredll_toplevel.o \
- coredll_utils.o \
+ coredll_x11_settings.o \
+ coredll_x11_toplevel.o \
+ coredll_x11_utils.o \
coredll_utilsx.o \
- coredll_window.o
+ coredll_x11_window.o
@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_5)
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___corelib___depname = \
$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
@@ -9379,19 +9445,19 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___corelib___depname = \
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ = install_corelib
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__uninstall_corelib___depname \
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ = uninstall_corelib
-@COND_GCC_PCH_1@__corelib_PCH_INC = -I.pch/wxprec_corelib
+@COND_GCC_PCH_1@__corelib_PCH_INC = -I./.pch/wxprec_corelib
@COND_ICC_PCH_1@__corelib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_corelib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_corelib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_corelib/wx/wxprec.h.gch
+@COND_ICC_PCH_1@ ./.pch/wxprec_corelib/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_corelib_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@ = ./.pch/wxprec_corelib/wx/wxprec.h.gch
@COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 =
@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 \
-@COND_PLATFORM_WIN32_1@ = corelib_evtloop.o corelib_main.o corelib_mslu.o \
-@COND_PLATFORM_WIN32_1@ corelib_volume.o
+@COND_PLATFORM_WIN32_1@ = corelib_msw_evtloop.o corelib_msw_main.o \
+@COND_PLATFORM_WIN32_1@ corelib_mslu.o corelib_volume.o
@COND_TOOLKIT_OSX_CARBON@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_5 \
-@COND_TOOLKIT_OSX_CARBON@ = corelib_utils.o corelib_uma.o
+@COND_TOOLKIT_OSX_CARBON@ = corelib_carbon_utils.o corelib_uma.o
@COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_5 \
-@COND_TOOLKIT_OSX_COCOA@ = corelib_utils.o
+@COND_TOOLKIT_OSX_COCOA@ = corelib_osx_cocoa_utils.o
COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \
$(__LOWLEVEL_SRC_OBJECTS_6) \
$(__PLATFORM_SRC_OBJECTS_9) \
@@ -9527,55 +9593,55 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \
COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \
$(__LOWLEVEL_SRC_OBJECTS_7) \
$(__PLATFORM_SRC_OBJECTS_9) \
- corelib_accel.o \
+ corelib_generic_accel.o \
corelib_clrpickerg.o \
corelib_collpaneg.o \
corelib_colrdlgg.o \
corelib_dirdlgg.o \
- corelib_fdrepdlg.o \
+ corelib_generic_fdrepdlg.o \
corelib_filedlgg.o \
corelib_filepickerg.o \
corelib_fontdlgg.o \
corelib_fontpickerg.o \
- corelib_listctrl.o \
+ corelib_generic_listctrl.o \
corelib_mdig.o \
corelib_msgdlgg.o \
corelib_prntdlgg.o \
corelib_tabg.o \
- corelib_bmpbuttn.o \
- corelib_button.o \
- corelib_checkbox.o \
- corelib_checklst.o \
- corelib_choice.o \
- corelib_combobox.o \
- corelib_control.o \
+ corelib_univ_bmpbuttn.o \
+ corelib_univ_button.o \
+ corelib_univ_checkbox.o \
+ corelib_univ_checklst.o \
+ corelib_univ_choice.o \
+ corelib_univ_combobox.o \
+ corelib_univ_control.o \
corelib_ctrlrend.o \
- corelib_dialog.o \
+ corelib_univ_dialog.o \
corelib_framuniv.o \
- corelib_gauge.o \
+ corelib_univ_gauge.o \
corelib_inpcons.o \
corelib_inphand.o \
- corelib_listbox.o \
- corelib_menu.o \
- corelib_notebook.o \
- corelib_radiobox.o \
- corelib_radiobut.o \
+ corelib_univ_listbox.o \
+ corelib_univ_menu.o \
+ corelib_univ_notebook.o \
+ corelib_univ_radiobox.o \
+ corelib_univ_radiobut.o \
corelib_scrarrow.o \
- corelib_scrolbar.o \
+ corelib_univ_scrolbar.o \
corelib_scrthumb.o \
corelib_settingsuniv.o \
- corelib_slider.o \
- corelib_spinbutt.o \
- corelib_statbmp.o \
- corelib_statbox.o \
- corelib_statline.o \
- corelib_stattext.o \
- corelib_statusbr.o \
+ corelib_univ_slider.o \
+ corelib_univ_spinbutt.o \
+ corelib_univ_statbmp.o \
+ corelib_univ_statbox.o \
+ corelib_univ_statline.o \
+ corelib_univ_stattext.o \
+ corelib_univ_statusbr.o \
corelib_stdrend.o \
- corelib_textctrl.o \
- corelib_tglbtn.o \
+ corelib_univ_textctrl.o \
+ corelib_univ_tglbtn.o \
corelib_theme.o \
- corelib_toolbar.o \
+ corelib_univ_toolbar.o \
corelib_topluniv.o \
corelib_winuniv.o \
corelib_gtk.o \
@@ -9714,209 +9780,209 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \
@COND_TOOLKIT_COCOA@ corelib_hid.o corelib_utilsexc_cf.o
COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_6 = \
corelib_fontmgrcmn.o \
- corelib_caret.o \
- corelib_colour.o \
- corelib_icon.o \
- corelib_imaglist.o \
+ corelib_generic_caret.o \
+ corelib_generic_colour.o \
+ corelib_generic_icon.o \
+ corelib_generic_imaglist.o \
corelib_mask.o \
- corelib_timer.o \
- corelib_app.o \
- corelib_bitmap.o \
- corelib_brush.o \
- corelib_cursor.o \
- corelib_dc.o \
- corelib_dcclient.o \
- corelib_dcmemory.o \
- corelib_dcscreen.o \
- corelib_evtloop.o \
- corelib_font.o \
- corelib_fontenum.o \
- corelib_fontmgr.o \
- corelib_nonownedwnd.o \
- corelib_overlay.o \
- corelib_pen.o \
- corelib_region.o \
- corelib_settings.o \
- corelib_toplevel.o \
- corelib_utils.o \
- corelib_window.o \
+ corelib_generic_timer.o \
+ corelib_dfb_app.o \
+ corelib_dfb_bitmap.o \
+ corelib_dfb_brush.o \
+ corelib_dfb_cursor.o \
+ corelib_dfb_dc.o \
+ corelib_dfb_dcclient.o \
+ corelib_dfb_dcmemory.o \
+ corelib_dfb_dcscreen.o \
+ corelib_dfb_evtloop.o \
+ corelib_dfb_font.o \
+ corelib_dfb_fontenum.o \
+ corelib_dfb_fontmgr.o \
+ corelib_dfb_nonownedwnd.o \
+ corelib_dfb_overlay.o \
+ corelib_dfb_pen.o \
+ corelib_dfb_region.o \
+ corelib_dfb_settings.o \
+ corelib_dfb_toplevel.o \
+ corelib_dfb_utils.o \
+ corelib_dfb_window.o \
corelib_wrapdfb.o
@COND_TOOLKIT_DFB@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_6)
COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_6 = \
- corelib_caret.o \
- corelib_imaglist.o \
- corelib_dialup.o \
- corelib_fontenum.o \
- corelib_fontutil.o \
+ corelib_generic_caret.o \
+ corelib_generic_imaglist.o \
+ corelib_unix_dialup.o \
+ corelib_unix_fontenum.o \
+ corelib_unix_fontutil.o \
corelib_utilsx11.o \
corelib_displayx11.o \
- corelib_icon.o \
+ corelib_generic_icon.o \
corelib_paletteg.o \
- corelib_app.o \
- corelib_bitmap.o \
- corelib_brush.o \
- corelib_clipbrd.o \
- corelib_colour.o \
- corelib_cursor.o \
- corelib_data.o \
- corelib_dataobj.o \
- corelib_dc.o \
- corelib_dcclient.o \
- corelib_dcmemory.o \
- corelib_dcscreen.o \
- corelib_dnd.o \
- corelib_evtloop.o \
- corelib_font.o \
- corelib_gsockgtk.o \
- corelib_main.o \
- corelib_minifram.o \
- corelib_pen.o \
- corelib_popupwin.o \
- corelib_region.o \
- corelib_renderer.o \
- corelib_settings.o \
- corelib_timer.o \
- corelib_tooltip.o \
- corelib_toplevel.o \
- corelib_utilsgtk.o \
- corelib_win_gtk.o \
- corelib_window.o
+ corelib_gtk1_app.o \
+ corelib_gtk1_bitmap.o \
+ corelib_gtk1_brush.o \
+ corelib_gtk1_clipbrd.o \
+ corelib_gtk1_colour.o \
+ corelib_gtk1_cursor.o \
+ corelib_gtk1_data.o \
+ corelib_gtk1_dataobj.o \
+ corelib_gtk1_dc.o \
+ corelib_gtk1_dcclient.o \
+ corelib_gtk1_dcmemory.o \
+ corelib_gtk1_dcscreen.o \
+ corelib_gtk1_dnd.o \
+ corelib_gtk1_evtloop.o \
+ corelib_gtk1_font.o \
+ corelib_gtk1_gsockgtk.o \
+ corelib_gtk1_main.o \
+ corelib_gtk1_minifram.o \
+ corelib_gtk1_pen.o \
+ corelib_gtk1_popupwin.o \
+ corelib_gtk1_region.o \
+ corelib_gtk1_renderer.o \
+ corelib_gtk1_settings.o \
+ corelib_gtk1_timer.o \
+ corelib_gtk1_tooltip.o \
+ corelib_gtk1_toplevel.o \
+ corelib_gtk1_utilsgtk.o \
+ corelib_gtk1_win_gtk.o \
+ corelib_gtk1_window.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_6)
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_6 = \
- corelib_caret.o \
- corelib_imaglist.o \
- corelib_dialup.o \
- corelib_fontenum.o \
- corelib_fontutil.o \
+ corelib_generic_caret.o \
+ corelib_generic_imaglist.o \
+ corelib_unix_dialup.o \
+ corelib_unix_fontenum.o \
+ corelib_unix_fontutil.o \
corelib_utilsx11.o \
corelib_displayx11.o \
- corelib_icon.o \
+ corelib_generic_icon.o \
corelib_paletteg.o \
- corelib_app.o \
+ corelib_gtk_app.o \
corelib_assertdlg_gtk.o \
- corelib_bitmap.o \
- corelib_brush.o \
- corelib_clipbrd.o \
- corelib_colour.o \
- corelib_cursor.o \
- corelib_dataobj.o \
- corelib_dc.o \
- corelib_dcclient.o \
- corelib_dcmemory.o \
- corelib_dcscreen.o \
- corelib_dnd.o \
- corelib_evtloop.o \
+ corelib_gtk_bitmap.o \
+ corelib_gtk_brush.o \
+ corelib_gtk_clipbrd.o \
+ corelib_gtk_colour.o \
+ corelib_gtk_cursor.o \
+ corelib_gtk_dataobj.o \
+ corelib_gtk_dc.o \
+ corelib_gtk_dcclient.o \
+ corelib_gtk_dcmemory.o \
+ corelib_gtk_dcscreen.o \
+ corelib_gtk_dnd.o \
+ corelib_gtk_evtloop.o \
corelib_filectrl.o \
- corelib_font.o \
- corelib_gsockgtk.o \
- corelib_minifram.o \
- corelib_pen.o \
- corelib_popupwin.o \
+ corelib_gtk_font.o \
+ corelib_gtk_gsockgtk.o \
+ corelib_gtk_minifram.o \
+ corelib_gtk_pen.o \
+ corelib_gtk_popupwin.o \
corelib_private.o \
- corelib_region.o \
- corelib_renderer.o \
- corelib_settings.o \
- corelib_timer.o \
- corelib_tooltip.o \
- corelib_toplevel.o \
- corelib_utilsgtk.o \
- corelib_win_gtk.o \
- corelib_window.o
+ corelib_gtk_region.o \
+ corelib_gtk_renderer.o \
+ corelib_gtk_settings.o \
+ corelib_gtk_timer.o \
+ corelib_gtk_tooltip.o \
+ corelib_gtk_toplevel.o \
+ corelib_gtk_utilsgtk.o \
+ corelib_gtk_win_gtk.o \
+ corelib_gtk_window.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_6)
COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_6 = \
corelib_fontmgrcmn.o \
- corelib_caret.o \
- corelib_colour.o \
- corelib_icon.o \
- corelib_imaglist.o \
+ corelib_generic_caret.o \
+ corelib_generic_colour.o \
+ corelib_generic_icon.o \
+ corelib_generic_imaglist.o \
corelib_mask.o \
- corelib_timer.o \
- corelib_app.o \
- corelib_bitmap.o \
- corelib_brush.o \
- corelib_clipbrd.o \
- corelib_cursor.o \
- corelib_data.o \
- corelib_dc.o \
- corelib_dcclient.o \
- corelib_dcmemory.o \
- corelib_dcscreen.o \
+ corelib_generic_timer.o \
+ corelib_mgl_app.o \
+ corelib_mgl_bitmap.o \
+ corelib_mgl_brush.o \
+ corelib_mgl_clipbrd.o \
+ corelib_mgl_cursor.o \
+ corelib_mgl_data.o \
+ corelib_mgl_dc.o \
+ corelib_mgl_dcclient.o \
+ corelib_mgl_dcmemory.o \
+ corelib_mgl_dcscreen.o \
corelib_dirmgl.o \
- corelib_evtloop.o \
- corelib_font.o \
- corelib_fontenum.o \
- corelib_fontmgr.o \
- corelib_fontutil.o \
- corelib_palette.o \
- corelib_pen.o \
- corelib_region.o \
- corelib_settings.o \
- corelib_toplevel.o \
- corelib_utils.o \
- corelib_window.o
+ corelib_mgl_evtloop.o \
+ corelib_mgl_font.o \
+ corelib_mgl_fontenum.o \
+ corelib_mgl_fontmgr.o \
+ corelib_mgl_fontutil.o \
+ corelib_mgl_palette.o \
+ corelib_mgl_pen.o \
+ corelib_mgl_region.o \
+ corelib_mgl_settings.o \
+ corelib_mgl_toplevel.o \
+ corelib_mgl_utils.o \
+ corelib_mgl_window.o
@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_6)
COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_6 = \
- corelib_caret.o \
- corelib_imaglist.o \
- corelib_dialup.o \
- corelib_fontenum.o \
- corelib_fontutil.o \
+ corelib_generic_caret.o \
+ corelib_generic_imaglist.o \
+ corelib_unix_dialup.o \
+ corelib_unix_fontenum.o \
+ corelib_unix_fontutil.o \
corelib_utilsx11.o \
corelib_displayx11.o \
- corelib_bitmap.o \
- corelib_brush.o \
- corelib_palette.o \
- corelib_pen.o \
- corelib_region.o \
+ corelib_x11_bitmap.o \
+ corelib_x11_brush.o \
+ corelib_x11_palette.o \
+ corelib_x11_pen.o \
+ corelib_x11_region.o \
corelib_utilsx.o
@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_6)
COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 = \
- corelib_app.o \
- corelib_bitmap.o \
- corelib_brush.o \
- corelib_caret.o \
- corelib_clipbrd.o \
- corelib_colour.o \
- corelib_cursor.o \
- corelib_data.o \
- corelib_dc.o \
- corelib_dcclient.o \
- corelib_dcmemory.o \
- corelib_dcprint.o \
- corelib_dcscreen.o \
- corelib_dialup.o \
+ corelib_msw_app.o \
+ corelib_msw_bitmap.o \
+ corelib_msw_brush.o \
+ corelib_msw_caret.o \
+ corelib_msw_clipbrd.o \
+ corelib_msw_colour.o \
+ corelib_msw_cursor.o \
+ corelib_msw_data.o \
+ corelib_msw_dc.o \
+ corelib_msw_dcclient.o \
+ corelib_msw_dcmemory.o \
+ corelib_msw_dcprint.o \
+ corelib_msw_dcscreen.o \
+ corelib_msw_dialup.o \
corelib_dib.o \
- corelib_display.o \
+ corelib_msw_display.o \
corelib_enhmeta.o \
- corelib_font.o \
- corelib_fontenum.o \
- corelib_fontutil.o \
- corelib_gdiimage.o \
- corelib_gdiobj.o \
+ corelib_msw_font.o \
+ corelib_msw_fontenum.o \
+ corelib_msw_fontutil.o \
+ corelib_msw_gdiimage.o \
+ corelib_msw_gdiobj.o \
corelib_gdiplus.o \
- corelib_graphics.o \
- corelib_icon.o \
- corelib_imaglist.o \
- corelib_minifram.o \
- corelib_dataobj.o \
+ corelib_msw_graphics.o \
+ corelib_msw_icon.o \
+ corelib_msw_imaglist.o \
+ corelib_msw_minifram.o \
+ corelib_ole_dataobj.o \
corelib_dropsrc.o \
corelib_droptgt.o \
corelib_oleutils.o \
- corelib_palette.o \
- corelib_pen.o \
- corelib_popupwin.o \
- corelib_printdlg.o \
+ corelib_msw_palette.o \
+ corelib_msw_pen.o \
+ corelib_msw_popupwin.o \
+ corelib_msw_printdlg.o \
corelib_printwin.o \
- corelib_region.o \
- corelib_renderer.o \
- corelib_settings.o \
- corelib_tooltip.o \
- corelib_toplevel.o \
- corelib_utilsgui.o \
+ corelib_msw_region.o \
+ corelib_msw_renderer.o \
+ corelib_msw_settings.o \
+ corelib_msw_tooltip.o \
+ corelib_msw_toplevel.o \
+ corelib_msw_utilsgui.o \
corelib_uxtheme.o \
- corelib_window.o \
+ corelib_msw_window.o \
corelib_helpchm.o \
- corelib_helpwin.o \
+ corelib_msw_helpwin.o \
corelib_automtn.o \
corelib_uuid.o
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6)
@@ -9926,87 +9992,87 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 = \
@COND_TOOLKIT_OSX_COCOA@ $(__OSX_LOWLEVEL_SRC_OBJECTS_1_4)
@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_6 =
COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_6 = \
- corelib_app.o \
- corelib_bitmap.o \
- corelib_brush.o \
- corelib_caret.o \
- corelib_clipbrd.o \
- corelib_colour.o \
- corelib_cursor.o \
- corelib_data.o \
- corelib_dc.o \
- corelib_dcclient.o \
- corelib_dcmemory.o \
- corelib_dcprint.o \
- corelib_dcscreen.o \
- corelib_dialup.o \
+ corelib_msw_app.o \
+ corelib_msw_bitmap.o \
+ corelib_msw_brush.o \
+ corelib_msw_caret.o \
+ corelib_msw_clipbrd.o \
+ corelib_msw_colour.o \
+ corelib_msw_cursor.o \
+ corelib_msw_data.o \
+ corelib_msw_dc.o \
+ corelib_msw_dcclient.o \
+ corelib_msw_dcmemory.o \
+ corelib_msw_dcprint.o \
+ corelib_msw_dcscreen.o \
+ corelib_msw_dialup.o \
corelib_dib.o \
- corelib_display.o \
+ corelib_msw_display.o \
corelib_enhmeta.o \
- corelib_font.o \
- corelib_fontenum.o \
- corelib_fontutil.o \
- corelib_gdiimage.o \
- corelib_gdiobj.o \
+ corelib_msw_font.o \
+ corelib_msw_fontenum.o \
+ corelib_msw_fontutil.o \
+ corelib_msw_gdiimage.o \
+ corelib_msw_gdiobj.o \
corelib_gdiplus.o \
- corelib_graphics.o \
- corelib_icon.o \
- corelib_imaglist.o \
- corelib_minifram.o \
- corelib_dataobj.o \
+ corelib_msw_graphics.o \
+ corelib_msw_icon.o \
+ corelib_msw_imaglist.o \
+ corelib_msw_minifram.o \
+ corelib_ole_dataobj.o \
corelib_dropsrc.o \
corelib_droptgt.o \
corelib_oleutils.o \
- corelib_palette.o \
- corelib_pen.o \
- corelib_popupwin.o \
- corelib_printdlg.o \
+ corelib_msw_palette.o \
+ corelib_msw_pen.o \
+ corelib_msw_popupwin.o \
+ corelib_msw_printdlg.o \
corelib_printwin.o \
- corelib_region.o \
- corelib_renderer.o \
- corelib_settings.o \
- corelib_tooltip.o \
- corelib_toplevel.o \
- corelib_utilsgui.o \
+ corelib_msw_region.o \
+ corelib_msw_renderer.o \
+ corelib_msw_settings.o \
+ corelib_msw_tooltip.o \
+ corelib_msw_toplevel.o \
+ corelib_msw_utilsgui.o \
corelib_uxtheme.o \
- corelib_window.o
+ corelib_msw_window.o
@COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_6)
COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_6 = \
- corelib_caret.o \
- corelib_imaglist.o \
- corelib_dialup.o \
- corelib_fontenum.o \
- corelib_fontutil.o \
+ corelib_generic_caret.o \
+ corelib_generic_imaglist.o \
+ corelib_unix_dialup.o \
+ corelib_unix_fontenum.o \
+ corelib_unix_fontutil.o \
corelib_utilsx11.o \
corelib_displayx11.o \
- corelib_icon.o \
- corelib_timer.o \
- corelib_app.o \
- corelib_bitmap.o \
- corelib_brush.o \
- corelib_clipbrd.o \
- corelib_colour.o \
- corelib_cursor.o \
- corelib_data.o \
- corelib_dataobj.o \
- corelib_dc.o \
- corelib_dcclient.o \
- corelib_dcmemory.o \
- corelib_dcscreen.o \
- corelib_evtloop.o \
- corelib_font.o \
- corelib_minifram.o \
+ corelib_generic_icon.o \
+ corelib_generic_timer.o \
+ corelib_x11_app.o \
+ corelib_x11_bitmap.o \
+ corelib_x11_brush.o \
+ corelib_x11_clipbrd.o \
+ corelib_x11_colour.o \
+ corelib_x11_cursor.o \
+ corelib_x11_data.o \
+ corelib_x11_dataobj.o \
+ corelib_x11_dc.o \
+ corelib_x11_dcclient.o \
+ corelib_x11_dcmemory.o \
+ corelib_x11_dcscreen.o \
+ corelib_x11_evtloop.o \
+ corelib_x11_font.o \
+ corelib_x11_minifram.o \
corelib_nanox.o \
- corelib_palette.o \
- corelib_pen.o \
- corelib_popupwin.o \
- corelib_region.o \
+ corelib_x11_palette.o \
+ corelib_x11_pen.o \
+ corelib_x11_popupwin.o \
+ corelib_x11_region.o \
corelib_reparent.o \
- corelib_settings.o \
- corelib_toplevel.o \
- corelib_utils.o \
+ corelib_x11_settings.o \
+ corelib_x11_toplevel.o \
+ corelib_x11_utils.o \
corelib_utilsx.o \
- corelib_window.o
+ corelib_x11_window.o
@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_6)
COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 = \
corelib_NSBox.o \
@@ -10022,256 +10088,256 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 = \
corelib_NSView.o \
corelib_NSWindow.o \
corelib_ObjcRef.o \
- corelib_app.o \
- corelib_bitmap.o \
- corelib_bmpbuttn.o \
- corelib_brush.o \
- corelib_button.o \
- corelib_checkbox.o \
- corelib_checklst.o \
- corelib_choice.o \
- corelib_clipbrd.o \
- corelib_colordlg.o \
- corelib_colour.o \
- corelib_combobox.o \
- corelib_control.o \
- corelib_cursor.o \
- corelib_data.o \
- corelib_dataobj.o \
- corelib_dc.o \
- corelib_dcclient.o \
- corelib_dcmemory.o \
- corelib_dcscreen.o \
- corelib_dialog.o \
- corelib_dirdlg.o \
- corelib_display.o \
+ corelib_cocoa_app.o \
+ corelib_cocoa_bitmap.o \
+ corelib_src_cocoa_bmpbuttn.o \
+ corelib_cocoa_brush.o \
+ corelib_src_cocoa_button.o \
+ corelib_src_cocoa_checkbox.o \
+ corelib_cocoa_checklst.o \
+ corelib_src_cocoa_choice.o \
+ corelib_cocoa_clipbrd.o \
+ corelib_cocoa_colordlg.o \
+ corelib_cocoa_colour.o \
+ corelib_cocoa_combobox.o \
+ corelib_cocoa_control.o \
+ corelib_cocoa_cursor.o \
+ corelib_cocoa_data.o \
+ corelib_cocoa_dataobj.o \
+ corelib_cocoa_dc.o \
+ corelib_cocoa_dcclient.o \
+ corelib_cocoa_dcmemory.o \
+ corelib_cocoa_dcscreen.o \
+ corelib_src_cocoa_dialog.o \
+ corelib_src_cocoa_dirdlg.o \
+ corelib_cocoa_display.o \
corelib_drawer.o \
- corelib_evtloop.o \
- corelib_filedlg.o \
- corelib_font.o \
- corelib_fontdlg.o \
- corelib_fontenum.o \
- corelib_fontutil.o \
- corelib_frame.o \
- corelib_gauge.o \
- corelib_icon.o \
- corelib_listbox.o \
- corelib_main.o \
+ corelib_src_cocoa_evtloop.o \
+ corelib_src_cocoa_filedlg.o \
+ corelib_cocoa_font.o \
+ corelib_cocoa_fontdlg.o \
+ corelib_cocoa_fontenum.o \
+ corelib_cocoa_fontutil.o \
+ corelib_cocoa_frame.o \
+ corelib_src_cocoa_gauge.o \
+ corelib_cocoa_icon.o \
+ corelib_src_cocoa_listbox.o \
+ corelib_cocoa_main.o \
corelib_mbarman.o \
- corelib_mdi.o \
- corelib_menu.o \
- corelib_menuitem.o \
- corelib_msgdlg.o \
- corelib_notebook.o \
- corelib_pen.o \
- corelib_radiobox.o \
- corelib_radiobut.o \
- corelib_region.o \
- corelib_scrolbar.o \
- corelib_settings.o \
- corelib_slider.o \
+ corelib_cocoa_mdi.o \
+ corelib_src_cocoa_menu.o \
+ corelib_src_cocoa_menuitem.o \
+ corelib_src_cocoa_msgdlg.o \
+ corelib_src_cocoa_notebook.o \
+ corelib_cocoa_pen.o \
+ corelib_cocoa_radiobox.o \
+ corelib_src_cocoa_radiobut.o \
+ corelib_cocoa_region.o \
+ corelib_src_cocoa_scrolbar.o \
+ corelib_cocoa_settings.o \
+ corelib_src_cocoa_slider.o \
corelib_sound.o \
- corelib_spinbutt.o \
- corelib_statbmp.o \
- corelib_statbox.o \
+ corelib_src_cocoa_spinbutt.o \
+ corelib_cocoa_statbmp.o \
+ corelib_src_cocoa_statbox.o \
corelib_statline2.o \
- corelib_stattext.o \
- corelib_textctrl.o \
- corelib_timer.o \
- corelib_toolbar.o \
- corelib_tooltip.o \
- corelib_toplevel.o \
- corelib_utils.o \
+ corelib_src_cocoa_stattext.o \
+ corelib_src_cocoa_textctrl.o \
+ corelib_cocoa_timer.o \
+ corelib_src_cocoa_toolbar.o \
+ corelib_src_cocoa_tooltip.o \
+ corelib_cocoa_toplevel.o \
+ corelib_src_cocoa_utils.o \
corelib_utilsexc.o \
- corelib_window.o \
- corelib_accel.o \
- corelib_caret.o \
+ corelib_src_cocoa_window.o \
+ corelib_generic_accel.o \
+ corelib_generic_caret.o \
corelib_clrpickerg.o \
corelib_collpaneg.o \
corelib_colrdlgg.o \
- corelib_fdrepdlg.o \
+ corelib_generic_fdrepdlg.o \
corelib_filepickerg.o \
corelib_fontdlgg.o \
corelib_fontpickerg.o \
- corelib_imaglist.o \
- corelib_listctrl.o \
+ corelib_generic_imaglist.o \
+ corelib_generic_listctrl.o \
corelib_msgdlgg.o \
corelib_paletteg.o \
corelib_regiong.o \
- corelib_statusbr.o \
+ corelib_generic_statusbr.o \
corelib_tabg.o
@COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3)
COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_3 = \
- corelib_accel.o \
+ corelib_generic_accel.o \
corelib_clrpickerg.o \
corelib_collpaneg.o \
corelib_colrdlgg.o \
corelib_dirdlgg.o \
- corelib_fdrepdlg.o \
+ corelib_generic_fdrepdlg.o \
corelib_filedlgg.o \
corelib_filepickerg.o \
corelib_fontdlgg.o \
corelib_fontpickerg.o \
- corelib_listctrl.o \
+ corelib_generic_listctrl.o \
corelib_msgdlgg.o \
corelib_prntdlgg.o \
- corelib_statusbr.o \
+ corelib_generic_statusbr.o \
corelib_tabg.o \
- corelib_bmpbuttn.o \
- corelib_button.o \
- corelib_checkbox.o \
- corelib_checklst.o \
- corelib_choice.o \
- corelib_combobox.o \
- corelib_control.o \
- corelib_dialog.o \
- corelib_filedlg.o \
- corelib_fontdlg.o \
- corelib_frame.o \
- corelib_gauge.o \
- corelib_listbox.o \
- corelib_mdi.o \
- corelib_menu.o \
- corelib_notebook.o \
- corelib_radiobox.o \
- corelib_radiobut.o \
- corelib_scrolbar.o \
- corelib_scrolwin.o \
- corelib_slider.o \
- corelib_spinbutt.o \
- corelib_spinctrl.o \
- corelib_statbmp.o \
- corelib_statbox.o \
- corelib_statline.o \
- corelib_stattext.o \
- corelib_tbargtk.o \
- corelib_textctrl.o \
- corelib_tglbtn.o
+ corelib_gtk1_bmpbuttn.o \
+ corelib_gtk1_button.o \
+ corelib_gtk1_checkbox.o \
+ corelib_gtk1_checklst.o \
+ corelib_gtk1_choice.o \
+ corelib_gtk1_combobox.o \
+ corelib_gtk1_control.o \
+ corelib_gtk1_dialog.o \
+ corelib_gtk1_filedlg.o \
+ corelib_gtk1_fontdlg.o \
+ corelib_gtk1_frame.o \
+ corelib_gtk1_gauge.o \
+ corelib_gtk1_listbox.o \
+ corelib_gtk1_mdi.o \
+ corelib_gtk1_menu.o \
+ corelib_gtk1_notebook.o \
+ corelib_gtk1_radiobox.o \
+ corelib_gtk1_radiobut.o \
+ corelib_gtk1_scrolbar.o \
+ corelib_gtk1_scrolwin.o \
+ corelib_gtk1_slider.o \
+ corelib_gtk1_spinbutt.o \
+ corelib_gtk1_spinctrl.o \
+ corelib_gtk1_statbmp.o \
+ corelib_gtk1_statbox.o \
+ corelib_gtk1_statline.o \
+ corelib_gtk1_stattext.o \
+ corelib_gtk1_tbargtk.o \
+ corelib_gtk1_textctrl.o \
+ corelib_gtk1_tglbtn.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_3)
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_3 = \
- corelib_accel.o \
- corelib_fdrepdlg.o \
+ corelib_generic_accel.o \
+ corelib_generic_fdrepdlg.o \
corelib_filepickerg.o \
corelib_graphicc.o \
- corelib_listctrl.o \
+ corelib_generic_listctrl.o \
corelib_prntdlgg.o \
- corelib_statusbr.o \
+ corelib_generic_statusbr.o \
corelib_tabg.o \
corelib_fontdlgg.o \
corelib_msgdlgg.o \
corelib_artgtk.o \
- corelib_bmpbuttn.o \
- corelib_button.o \
- corelib_checkbox.o \
- corelib_checklst.o \
- corelib_choice.o \
+ corelib_gtk_bmpbuttn.o \
+ corelib_gtk_button.o \
+ corelib_gtk_checkbox.o \
+ corelib_gtk_checklst.o \
+ corelib_gtk_choice.o \
corelib_collpane.o \
- corelib_colordlg.o \
- corelib_combobox.o \
- corelib_control.o \
+ corelib_gtk_colordlg.o \
+ corelib_gtk_combobox.o \
+ corelib_gtk_control.o \
corelib_clrpicker.o \
- corelib_dialog.o \
+ corelib_gtk_dialog.o \
corelib_fontpicker.o \
corelib_filepicker.o \
- corelib_dirdlg.o \
- corelib_filedlg.o \
- corelib_fontdlg.o \
- corelib_frame.o \
- corelib_gauge.o \
+ corelib_gtk_dirdlg.o \
+ corelib_gtk_filedlg.o \
+ corelib_gtk_fontdlg.o \
+ corelib_gtk_frame.o \
+ corelib_gtk_gauge.o \
corelib_gprint.o \
corelib_gvfs.o \
- corelib_print.o \
- corelib_listbox.o \
- corelib_mdi.o \
- corelib_menu.o \
+ corelib_gtk_print.o \
+ corelib_gtk_listbox.o \
+ corelib_gtk_mdi.o \
+ corelib_gtk_menu.o \
corelib_mnemonics.o \
- corelib_msgdlg.o \
- corelib_nativewin.o \
- corelib_notebook.o \
- corelib_radiobox.o \
- corelib_radiobut.o \
- corelib_scrolbar.o \
- corelib_scrolwin.o \
- corelib_slider.o \
- corelib_spinbutt.o \
- corelib_spinctrl.o \
- corelib_statbmp.o \
- corelib_statbox.o \
- corelib_statline.o \
- corelib_stattext.o \
- corelib_tbargtk.o \
- corelib_textctrl.o \
- corelib_textentry.o \
- corelib_tglbtn.o \
+ corelib_gtk_msgdlg.o \
+ corelib_gtk_nativewin.o \
+ corelib_gtk_notebook.o \
+ corelib_gtk_radiobox.o \
+ corelib_gtk_radiobut.o \
+ corelib_gtk_scrolbar.o \
+ corelib_gtk_scrolwin.o \
+ corelib_gtk_slider.o \
+ corelib_gtk_spinbutt.o \
+ corelib_gtk_spinctrl.o \
+ corelib_gtk_statbmp.o \
+ corelib_gtk_statbox.o \
+ corelib_gtk_statline.o \
+ corelib_gtk_stattext.o \
+ corelib_gtk_tbargtk.o \
+ corelib_gtk_textctrl.o \
+ corelib_gtk_textentry.o \
+ corelib_gtk_tglbtn.o \
corelib_treeentry_gtk.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_3)
COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3 = \
- corelib_accel.o \
- corelib_app.o \
- corelib_bmpbuttn.o \
+ corelib_motif_accel.o \
+ corelib_motif_app.o \
+ corelib_motif_bmpbuttn.o \
corelib_bmpmotif.o \
- corelib_button.o \
- corelib_checkbox.o \
- corelib_checklst.o \
- corelib_choice.o \
- corelib_clipbrd.o \
- corelib_colour.o \
- corelib_combobox.o \
+ corelib_motif_button.o \
+ corelib_motif_checkbox.o \
+ corelib_motif_checklst.o \
+ corelib_motif_choice.o \
+ corelib_motif_clipbrd.o \
+ corelib_motif_colour.o \
+ corelib_motif_combobox.o \
corelib_combobox_native.o \
- corelib_control.o \
- corelib_cursor.o \
- corelib_data.o \
- corelib_dataobj.o \
- corelib_dc.o \
- corelib_dcclient.o \
- corelib_dcmemory.o \
- corelib_dcscreen.o \
- corelib_dialog.o \
- corelib_evtloop.o \
- corelib_filedlg.o \
- corelib_font.o \
- corelib_frame.o \
- corelib_gauge.o \
+ corelib_motif_control.o \
+ corelib_motif_cursor.o \
+ corelib_motif_data.o \
+ corelib_motif_dataobj.o \
+ corelib_motif_dc.o \
+ corelib_motif_dcclient.o \
+ corelib_motif_dcmemory.o \
+ corelib_motif_dcscreen.o \
+ corelib_motif_dialog.o \
+ corelib_motif_evtloop.o \
+ corelib_motif_filedlg.o \
+ corelib_motif_font.o \
+ corelib_motif_frame.o \
+ corelib_motif_gauge.o \
corelib_gsockmot.o \
- corelib_icon.o \
- corelib_listbox.o \
- corelib_main.o \
- corelib_mdi.o \
- corelib_menu.o \
- corelib_menuitem.o \
- corelib_minifram.o \
- corelib_msgdlg.o \
- corelib_popupwin.o \
- corelib_radiobox.o \
- corelib_radiobut.o \
- corelib_scrolbar.o \
- corelib_settings.o \
- corelib_slider.o \
- corelib_spinbutt.o \
- corelib_statbmp.o \
- corelib_statbox.o \
- corelib_stattext.o \
- corelib_textctrl.o \
- corelib_textentry.o \
- corelib_timer.o \
- corelib_toolbar.o \
- corelib_toplevel.o \
- corelib_utils.o \
- corelib_window.o \
+ corelib_motif_icon.o \
+ corelib_motif_listbox.o \
+ corelib_motif_main.o \
+ corelib_motif_mdi.o \
+ corelib_motif_menu.o \
+ corelib_motif_menuitem.o \
+ corelib_motif_minifram.o \
+ corelib_motif_msgdlg.o \
+ corelib_motif_popupwin.o \
+ corelib_motif_radiobox.o \
+ corelib_motif_radiobut.o \
+ corelib_motif_scrolbar.o \
+ corelib_motif_settings.o \
+ corelib_motif_slider.o \
+ corelib_motif_spinbutt.o \
+ corelib_motif_statbmp.o \
+ corelib_motif_statbox.o \
+ corelib_motif_stattext.o \
+ corelib_motif_textctrl.o \
+ corelib_motif_textentry.o \
+ corelib_motif_timer.o \
+ corelib_motif_toolbar.o \
+ corelib_motif_toplevel.o \
+ corelib_motif_utils.o \
+ corelib_motif_window.o \
corelib_xmcombo.o \
corelib_clrpickerg.o \
corelib_collpaneg.o \
corelib_colrdlgg.o \
corelib_dirdlgg.o \
- corelib_fdrepdlg.o \
+ corelib_generic_fdrepdlg.o \
corelib_filepickerg.o \
corelib_fontdlgg.o \
corelib_fontpickerg.o \
- corelib_listctrl.o \
- corelib_notebook.o \
+ corelib_generic_listctrl.o \
+ corelib_generic_notebook.o \
corelib_prntdlgg.o \
- corelib_statline.o \
- corelib_statusbr.o \
+ corelib_generic_statline.o \
+ corelib_generic_statusbr.o \
corelib_tabg.o
@COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3)
COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \
@@ -10279,291 +10345,291 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \
corelib_collpaneg.o \
corelib_filepickerg.o \
corelib_fontpickerg.o \
- corelib_statusbr.o \
+ corelib_generic_statusbr.o \
corelib_prntdlgg.o \
- corelib_accel.o \
- corelib_bmpbuttn.o \
- corelib_button.o \
- corelib_checkbox.o \
- corelib_choice.o \
- corelib_colordlg.o \
+ corelib_msw_accel.o \
+ corelib_msw_bmpbuttn.o \
+ corelib_msw_button.o \
+ corelib_msw_checkbox.o \
+ corelib_msw_choice.o \
+ corelib_msw_colordlg.o \
corelib_combo.o \
- corelib_combobox.o \
- corelib_control.o \
- corelib_dialog.o \
- corelib_dirdlg.o \
+ corelib_msw_combobox.o \
+ corelib_msw_control.o \
+ corelib_msw_dialog.o \
+ corelib_msw_dirdlg.o \
corelib_dragimag.o \
- corelib_filedlg.o \
- corelib_frame.o \
- corelib_gauge.o \
- corelib_iniconf.o \
- corelib_listbox.o \
- corelib_listctrl.o \
- corelib_mdi.o \
- corelib_menu.o \
- corelib_menuitem.o \
- corelib_metafile.o \
- corelib_msgdlg.o \
- corelib_nativdlg.o \
- corelib_nativewin.o \
- corelib_notebook.o \
+ corelib_msw_filedlg.o \
+ corelib_msw_frame.o \
+ corelib_msw_gauge.o \
+ corelib_msw_iniconf.o \
+ corelib_msw_listbox.o \
+ corelib_msw_listctrl.o \
+ corelib_msw_mdi.o \
+ corelib_msw_menu.o \
+ corelib_msw_menuitem.o \
+ corelib_msw_metafile.o \
+ corelib_msw_msgdlg.o \
+ corelib_msw_nativdlg.o \
+ corelib_msw_nativewin.o \
+ corelib_msw_notebook.o \
corelib_access.o \
- corelib_ownerdrw.o \
- corelib_radiobox.o \
- corelib_radiobut.o \
- corelib_scrolbar.o \
- corelib_slider.o \
- corelib_spinbutt.o \
- corelib_spinctrl.o \
- corelib_statbmp.o \
- corelib_statbox.o \
+ corelib_msw_ownerdrw.o \
+ corelib_msw_radiobox.o \
+ corelib_msw_radiobut.o \
+ corelib_msw_scrolbar.o \
+ corelib_msw_slider.o \
+ corelib_msw_spinbutt.o \
+ corelib_msw_spinctrl.o \
+ corelib_msw_statbmp.o \
+ corelib_msw_statbox.o \
corelib_statusbar.o \
- corelib_statline.o \
- corelib_stattext.o \
- corelib_tabctrl.o \
- corelib_toolbar.o \
- corelib_textctrl.o \
- corelib_textentry.o \
- corelib_tglbtn.o \
+ corelib_msw_statline.o \
+ corelib_msw_stattext.o \
+ corelib_msw_tabctrl.o \
+ corelib_msw_toolbar.o \
+ corelib_msw_textctrl.o \
+ corelib_msw_textentry.o \
+ corelib_msw_tglbtn.o \
corelib_treectrl.o \
- corelib_checklst.o \
- corelib_fdrepdlg.o \
- corelib_fontdlg.o
+ corelib_msw_checklst.o \
+ corelib_msw_fdrepdlg.o \
+ corelib_msw_fontdlg.o
@COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3)
COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS_3 = \
$(__OSX_CARBON_COCOA_SRC_OBJECTS_9) \
- corelib_bmpbuttn.o \
- corelib_button.o \
- corelib_checkbox.o \
- corelib_choice.o \
- corelib_colordlg.o \
- corelib_dialog.o \
- corelib_dirdlg.o \
- corelib_evtloop.o \
- corelib_filedlg.o \
- corelib_gauge.o \
- corelib_listbox.o \
+ corelib_carbon_bmpbuttn.o \
+ corelib_carbon_button.o \
+ corelib_carbon_checkbox.o \
+ corelib_carbon_choice.o \
+ corelib_carbon_colordlg.o \
+ corelib_carbon_dialog.o \
+ corelib_carbon_dirdlg.o \
+ corelib_carbon_evtloop.o \
+ corelib_carbon_filedlg.o \
+ corelib_carbon_gauge.o \
+ corelib_carbon_listbox.o \
corelib_listctrl_mac.o \
- corelib_menu.o \
- corelib_menuitem.o \
- corelib_msgdlg.o \
- corelib_nonownedwnd.o \
+ corelib_carbon_menu.o \
+ corelib_carbon_menuitem.o \
+ corelib_carbon_msgdlg.o \
+ corelib_carbon_nonownedwnd.o \
corelib_notebmac.o \
- corelib_radiobut.o \
- corelib_region.o \
- corelib_scrolbar.o \
- corelib_slider.o \
- corelib_spinbutt.o \
- corelib_srchctrl.o \
- corelib_statbmp.o \
- corelib_statbox.o \
+ corelib_carbon_radiobut.o \
+ corelib_carbon_region.o \
+ corelib_carbon_scrolbar.o \
+ corelib_carbon_slider.o \
+ corelib_carbon_spinbutt.o \
+ corelib_carbon_srchctrl.o \
+ corelib_carbon_statbmp.o \
+ corelib_carbon_statbox.o \
corelib_statlmac.o \
- corelib_stattext.o \
- corelib_textctrl.o \
- corelib_tglbtn.o \
- corelib_toolbar.o \
- corelib_tooltip.o \
- corelib_window.o \
+ corelib_carbon_stattext.o \
+ corelib_carbon_textctrl.o \
+ corelib_carbon_tglbtn.o \
+ corelib_carbon_toolbar.o \
+ corelib_carbon_tooltip.o \
+ corelib_carbon_window.o \
corelib_webkit.o \
- corelib_caret.o \
+ corelib_generic_caret.o \
corelib_clrpickerg.o \
corelib_collpaneg.o \
- corelib_fdrepdlg.o \
+ corelib_generic_fdrepdlg.o \
corelib_filepickerg.o \
corelib_fontdlgg.o \
corelib_fontpickerg.o \
- corelib_listctrl.o \
+ corelib_generic_listctrl.o \
corelib_prntdlgg.o \
- corelib_statusbr.o \
+ corelib_generic_statusbr.o \
corelib_tabg.o
@COND_TOOLKIT_OSX_CARBON@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS_3)
COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_3 = \
$(__OSX_CARBON_COCOA_SRC_OBJECTS_9) \
- corelib_bmpbuttn.o \
- corelib_button.o \
- corelib_checkbox.o \
- corelib_choice.o \
- corelib_dialog.o \
- corelib_dirdlg.o \
- corelib_evtloop.o \
- corelib_filedlg.o \
- corelib_gauge.o \
- corelib_listbox.o \
- corelib_menu.o \
- corelib_menuitem.o \
- corelib_msgdlg.o \
- corelib_nonownedwnd.o \
- corelib_notebook.o \
- corelib_radiobut.o \
- corelib_scrolbar.o \
- corelib_slider.o \
- corelib_spinbutt.o \
- corelib_srchctrl.o \
- corelib_statbox.o \
- corelib_statline.o \
- corelib_stattext.o \
- corelib_textctrl.o \
- corelib_tglbtn.o \
- corelib_toolbar.o \
- corelib_tooltip.o \
- corelib_window.o \
- corelib_caret.o \
+ corelib_osx_cocoa_bmpbuttn.o \
+ corelib_osx_cocoa_button.o \
+ corelib_osx_cocoa_checkbox.o \
+ corelib_osx_cocoa_choice.o \
+ corelib_osx_cocoa_dialog.o \
+ corelib_osx_cocoa_dirdlg.o \
+ corelib_osx_cocoa_evtloop.o \
+ corelib_osx_cocoa_filedlg.o \
+ corelib_osx_cocoa_gauge.o \
+ corelib_osx_cocoa_listbox.o \
+ corelib_osx_cocoa_menu.o \
+ corelib_osx_cocoa_menuitem.o \
+ corelib_osx_cocoa_msgdlg.o \
+ corelib_cocoa_nonownedwnd.o \
+ corelib_osx_cocoa_notebook.o \
+ corelib_osx_cocoa_radiobut.o \
+ corelib_osx_cocoa_scrolbar.o \
+ corelib_osx_cocoa_slider.o \
+ corelib_osx_cocoa_spinbutt.o \
+ corelib_cocoa_srchctrl.o \
+ corelib_osx_cocoa_statbox.o \
+ corelib_cocoa_statline.o \
+ corelib_osx_cocoa_stattext.o \
+ corelib_osx_cocoa_textctrl.o \
+ corelib_cocoa_tglbtn.o \
+ corelib_osx_cocoa_toolbar.o \
+ corelib_osx_cocoa_tooltip.o \
+ corelib_osx_cocoa_window.o \
+ corelib_generic_caret.o \
corelib_clrpickerg.o \
corelib_collpaneg.o \
- corelib_fdrepdlg.o \
+ corelib_generic_fdrepdlg.o \
corelib_filepickerg.o \
corelib_fontdlgg.o \
corelib_fontpickerg.o \
- corelib_listctrl.o \
+ corelib_generic_listctrl.o \
corelib_prntdlgg.o \
corelib_regiong.o \
- corelib_statusbr.o \
+ corelib_generic_statusbr.o \
corelib_tabg.o
@COND_TOOLKIT_OSX_COCOA@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_3)
COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3 = \
- corelib_caret.o \
+ corelib_generic_caret.o \
corelib_clrpickerg.o \
corelib_collpaneg.o \
corelib_colrdlgg.o \
corelib_dirdlgg.o \
- corelib_fdrepdlg.o \
+ corelib_generic_fdrepdlg.o \
corelib_filepickerg.o \
corelib_fontpickerg.o \
- corelib_imaglist.o \
- corelib_listctrl.o \
+ corelib_generic_imaglist.o \
+ corelib_generic_listctrl.o \
corelib_mdig.o \
corelib_prntdlgg.o \
- corelib_statusbr.o \
- corelib_accel.o \
- corelib_app.o \
- corelib_bitmap.o \
- corelib_bmpbuttn.o \
- corelib_brush.o \
- corelib_button.o \
- corelib_checkbox.o \
- corelib_checklst.o \
- corelib_choice.o \
- corelib_clipbrd.o \
- corelib_colour.o \
- corelib_combobox.o \
- corelib_control.o \
- corelib_cursor.o \
- corelib_data.o \
- corelib_dataobj.o \
- corelib_dc.o \
- corelib_dcclient.o \
- corelib_dcmemory.o \
- corelib_dcprint.o \
- corelib_dcscreen.o \
- corelib_dialog.o \
- corelib_dnd.o \
- corelib_evtloop.o \
- corelib_filedlg.o \
- corelib_font.o \
- corelib_fontdlg.o \
- corelib_fontenum.o \
- corelib_fontutil.o \
- corelib_frame.o \
- corelib_gauge.o \
- corelib_gdiimage.o \
+ corelib_generic_statusbr.o \
+ corelib_os2_accel.o \
+ corelib_os2_app.o \
+ corelib_os2_bitmap.o \
+ corelib_os2_bmpbuttn.o \
+ corelib_os2_brush.o \
+ corelib_os2_button.o \
+ corelib_os2_checkbox.o \
+ corelib_os2_checklst.o \
+ corelib_os2_choice.o \
+ corelib_os2_clipbrd.o \
+ corelib_os2_colour.o \
+ corelib_os2_combobox.o \
+ corelib_os2_control.o \
+ corelib_os2_cursor.o \
+ corelib_os2_data.o \
+ corelib_os2_dataobj.o \
+ corelib_os2_dc.o \
+ corelib_os2_dcclient.o \
+ corelib_os2_dcmemory.o \
+ corelib_os2_dcprint.o \
+ corelib_os2_dcscreen.o \
+ corelib_os2_dialog.o \
+ corelib_os2_dnd.o \
+ corelib_os2_evtloop.o \
+ corelib_os2_filedlg.o \
+ corelib_os2_font.o \
+ corelib_os2_fontdlg.o \
+ corelib_os2_fontenum.o \
+ corelib_os2_fontutil.o \
+ corelib_os2_frame.o \
+ corelib_os2_gauge.o \
+ corelib_os2_gdiimage.o \
corelib_gsockpm.o \
- corelib_helpwin.o \
- corelib_icon.o \
- corelib_iniconf.o \
- corelib_listbox.o \
- corelib_main.o \
- corelib_menu.o \
- corelib_menuitem.o \
- corelib_metafile.o \
- corelib_minifram.o \
- corelib_msgdlg.o \
- corelib_nativdlg.o \
- corelib_notebook.o \
- corelib_ownerdrw.o \
- corelib_palette.o \
- corelib_pen.o \
- corelib_popupwin.o \
- corelib_print.o \
- corelib_radiobox.o \
- corelib_radiobut.o \
- corelib_region.o \
- corelib_scrolbar.o \
- corelib_settings.o \
- corelib_slider.o \
- corelib_spinbutt.o \
- corelib_spinctrl.o \
- corelib_statbmp.o \
- corelib_statbox.o \
- corelib_statline.o \
- corelib_stattext.o \
- corelib_tabctrl.o \
- corelib_textctrl.o \
- corelib_textentry.o \
- corelib_tglbtn.o \
- corelib_timer.o \
- corelib_toolbar.o \
- corelib_tooltip.o \
- corelib_toplevel.o \
- corelib_utilsgui.o \
- corelib_window.o
+ corelib_os2_helpwin.o \
+ corelib_os2_icon.o \
+ corelib_os2_iniconf.o \
+ corelib_os2_listbox.o \
+ corelib_os2_main.o \
+ corelib_os2_menu.o \
+ corelib_os2_menuitem.o \
+ corelib_os2_metafile.o \
+ corelib_os2_minifram.o \
+ corelib_os2_msgdlg.o \
+ corelib_os2_nativdlg.o \
+ corelib_os2_notebook.o \
+ corelib_os2_ownerdrw.o \
+ corelib_os2_palette.o \
+ corelib_os2_pen.o \
+ corelib_os2_popupwin.o \
+ corelib_os2_print.o \
+ corelib_os2_radiobox.o \
+ corelib_os2_radiobut.o \
+ corelib_os2_region.o \
+ corelib_os2_scrolbar.o \
+ corelib_os2_settings.o \
+ corelib_os2_slider.o \
+ corelib_os2_spinbutt.o \
+ corelib_os2_spinctrl.o \
+ corelib_os2_statbmp.o \
+ corelib_os2_statbox.o \
+ corelib_os2_statline.o \
+ corelib_os2_stattext.o \
+ corelib_os2_tabctrl.o \
+ corelib_os2_textctrl.o \
+ corelib_os2_textentry.o \
+ corelib_os2_tglbtn.o \
+ corelib_os2_timer.o \
+ corelib_os2_toolbar.o \
+ corelib_os2_tooltip.o \
+ corelib_os2_toplevel.o \
+ corelib_os2_utilsgui.o \
+ corelib_os2_window.o
@COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3)
COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 = \
corelib_clrpickerg.o \
corelib_collpaneg.o \
corelib_filepickerg.o \
corelib_fontpickerg.o \
- corelib_statusbr.o \
+ corelib_generic_statusbr.o \
corelib_prntdlgg.o \
- corelib_accel.o \
- corelib_bmpbuttn.o \
- corelib_button.o \
- corelib_checkbox.o \
- corelib_choice.o \
- corelib_colordlg.o \
+ corelib_msw_accel.o \
+ corelib_msw_bmpbuttn.o \
+ corelib_msw_button.o \
+ corelib_msw_checkbox.o \
+ corelib_msw_choice.o \
+ corelib_msw_colordlg.o \
corelib_combo.o \
- corelib_combobox.o \
- corelib_control.o \
- corelib_dialog.o \
- corelib_dirdlg.o \
+ corelib_msw_combobox.o \
+ corelib_msw_control.o \
+ corelib_msw_dialog.o \
+ corelib_msw_dirdlg.o \
corelib_dragimag.o \
- corelib_filedlg.o \
- corelib_frame.o \
- corelib_gauge.o \
- corelib_iniconf.o \
- corelib_listbox.o \
- corelib_listctrl.o \
- corelib_mdi.o \
- corelib_menu.o \
- corelib_menuitem.o \
- corelib_metafile.o \
- corelib_msgdlg.o \
- corelib_nativdlg.o \
- corelib_nativewin.o \
- corelib_notebook.o \
+ corelib_msw_filedlg.o \
+ corelib_msw_frame.o \
+ corelib_msw_gauge.o \
+ corelib_msw_iniconf.o \
+ corelib_msw_listbox.o \
+ corelib_msw_listctrl.o \
+ corelib_msw_mdi.o \
+ corelib_msw_menu.o \
+ corelib_msw_menuitem.o \
+ corelib_msw_metafile.o \
+ corelib_msw_msgdlg.o \
+ corelib_msw_nativdlg.o \
+ corelib_msw_nativewin.o \
+ corelib_msw_notebook.o \
corelib_access.o \
- corelib_ownerdrw.o \
- corelib_radiobox.o \
- corelib_radiobut.o \
- corelib_scrolbar.o \
- corelib_slider.o \
- corelib_spinbutt.o \
- corelib_spinctrl.o \
- corelib_statbmp.o \
- corelib_statbox.o \
+ corelib_msw_ownerdrw.o \
+ corelib_msw_radiobox.o \
+ corelib_msw_radiobut.o \
+ corelib_msw_scrolbar.o \
+ corelib_msw_slider.o \
+ corelib_msw_spinbutt.o \
+ corelib_msw_spinctrl.o \
+ corelib_msw_statbmp.o \
+ corelib_msw_statbox.o \
corelib_statusbar.o \
- corelib_statline.o \
- corelib_stattext.o \
- corelib_tabctrl.o \
- corelib_toolbar.o \
- corelib_textctrl.o \
- corelib_textentry.o \
- corelib_tglbtn.o \
+ corelib_msw_statline.o \
+ corelib_msw_stattext.o \
+ corelib_msw_tabctrl.o \
+ corelib_msw_toolbar.o \
+ corelib_msw_textctrl.o \
+ corelib_msw_textentry.o \
+ corelib_msw_tglbtn.o \
corelib_treectrl.o \
corelib_dirdlgg.o \
- corelib_fdrepdlg.o \
+ corelib_generic_fdrepdlg.o \
corelib_filedlgg.o \
corelib_fontdlgg.o \
- corelib_checklst.o \
+ corelib_wince_checklst.o \
corelib_choicece.o \
corelib_crt.o \
corelib_filedlgwce.o \
@@ -10577,209 +10643,209 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 = \
@COND_TOOLKIT_COCOA@ corelib_hid.o corelib_utilsexc_cf.o
COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_7 = \
corelib_fontmgrcmn.o \
- corelib_caret.o \
- corelib_colour.o \
- corelib_icon.o \
- corelib_imaglist.o \
+ corelib_generic_caret.o \
+ corelib_generic_colour.o \
+ corelib_generic_icon.o \
+ corelib_generic_imaglist.o \
corelib_mask.o \
- corelib_timer.o \
- corelib_app.o \
- corelib_bitmap.o \
- corelib_brush.o \
- corelib_cursor.o \
- corelib_dc.o \
- corelib_dcclient.o \
- corelib_dcmemory.o \
- corelib_dcscreen.o \
- corelib_evtloop.o \
- corelib_font.o \
- corelib_fontenum.o \
- corelib_fontmgr.o \
- corelib_nonownedwnd.o \
- corelib_overlay.o \
- corelib_pen.o \
- corelib_region.o \
- corelib_settings.o \
- corelib_toplevel.o \
- corelib_utils.o \
- corelib_window.o \
+ corelib_generic_timer.o \
+ corelib_dfb_app.o \
+ corelib_dfb_bitmap.o \
+ corelib_dfb_brush.o \
+ corelib_dfb_cursor.o \
+ corelib_dfb_dc.o \
+ corelib_dfb_dcclient.o \
+ corelib_dfb_dcmemory.o \
+ corelib_dfb_dcscreen.o \
+ corelib_dfb_evtloop.o \
+ corelib_dfb_font.o \
+ corelib_dfb_fontenum.o \
+ corelib_dfb_fontmgr.o \
+ corelib_dfb_nonownedwnd.o \
+ corelib_dfb_overlay.o \
+ corelib_dfb_pen.o \
+ corelib_dfb_region.o \
+ corelib_dfb_settings.o \
+ corelib_dfb_toplevel.o \
+ corelib_dfb_utils.o \
+ corelib_dfb_window.o \
corelib_wrapdfb.o
@COND_TOOLKIT_DFB@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_7)
COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_7 = \
- corelib_caret.o \
- corelib_imaglist.o \
- corelib_dialup.o \
- corelib_fontenum.o \
- corelib_fontutil.o \
+ corelib_generic_caret.o \
+ corelib_generic_imaglist.o \
+ corelib_unix_dialup.o \
+ corelib_unix_fontenum.o \
+ corelib_unix_fontutil.o \
corelib_utilsx11.o \
corelib_displayx11.o \
- corelib_icon.o \
+ corelib_generic_icon.o \
corelib_paletteg.o \
- corelib_app.o \
- corelib_bitmap.o \
- corelib_brush.o \
- corelib_clipbrd.o \
- corelib_colour.o \
- corelib_cursor.o \
- corelib_data.o \
- corelib_dataobj.o \
- corelib_dc.o \
- corelib_dcclient.o \
- corelib_dcmemory.o \
- corelib_dcscreen.o \
- corelib_dnd.o \
- corelib_evtloop.o \
- corelib_font.o \
- corelib_gsockgtk.o \
- corelib_main.o \
- corelib_minifram.o \
- corelib_pen.o \
- corelib_popupwin.o \
- corelib_region.o \
- corelib_renderer.o \
- corelib_settings.o \
- corelib_timer.o \
- corelib_tooltip.o \
- corelib_toplevel.o \
- corelib_utilsgtk.o \
- corelib_win_gtk.o \
- corelib_window.o
+ corelib_gtk1_app.o \
+ corelib_gtk1_bitmap.o \
+ corelib_gtk1_brush.o \
+ corelib_gtk1_clipbrd.o \
+ corelib_gtk1_colour.o \
+ corelib_gtk1_cursor.o \
+ corelib_gtk1_data.o \
+ corelib_gtk1_dataobj.o \
+ corelib_gtk1_dc.o \
+ corelib_gtk1_dcclient.o \
+ corelib_gtk1_dcmemory.o \
+ corelib_gtk1_dcscreen.o \
+ corelib_gtk1_dnd.o \
+ corelib_gtk1_evtloop.o \
+ corelib_gtk1_font.o \
+ corelib_gtk1_gsockgtk.o \
+ corelib_gtk1_main.o \
+ corelib_gtk1_minifram.o \
+ corelib_gtk1_pen.o \
+ corelib_gtk1_popupwin.o \
+ corelib_gtk1_region.o \
+ corelib_gtk1_renderer.o \
+ corelib_gtk1_settings.o \
+ corelib_gtk1_timer.o \
+ corelib_gtk1_tooltip.o \
+ corelib_gtk1_toplevel.o \
+ corelib_gtk1_utilsgtk.o \
+ corelib_gtk1_win_gtk.o \
+ corelib_gtk1_window.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_7)
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_7 = \
- corelib_caret.o \
- corelib_imaglist.o \
- corelib_dialup.o \
- corelib_fontenum.o \
- corelib_fontutil.o \
+ corelib_generic_caret.o \
+ corelib_generic_imaglist.o \
+ corelib_unix_dialup.o \
+ corelib_unix_fontenum.o \
+ corelib_unix_fontutil.o \
corelib_utilsx11.o \
corelib_displayx11.o \
- corelib_icon.o \
+ corelib_generic_icon.o \
corelib_paletteg.o \
- corelib_app.o \
+ corelib_gtk_app.o \
corelib_assertdlg_gtk.o \
- corelib_bitmap.o \
- corelib_brush.o \
- corelib_clipbrd.o \
- corelib_colour.o \
- corelib_cursor.o \
- corelib_dataobj.o \
- corelib_dc.o \
- corelib_dcclient.o \
- corelib_dcmemory.o \
- corelib_dcscreen.o \
- corelib_dnd.o \
- corelib_evtloop.o \
+ corelib_gtk_bitmap.o \
+ corelib_gtk_brush.o \
+ corelib_gtk_clipbrd.o \
+ corelib_gtk_colour.o \
+ corelib_gtk_cursor.o \
+ corelib_gtk_dataobj.o \
+ corelib_gtk_dc.o \
+ corelib_gtk_dcclient.o \
+ corelib_gtk_dcmemory.o \
+ corelib_gtk_dcscreen.o \
+ corelib_gtk_dnd.o \
+ corelib_gtk_evtloop.o \
corelib_filectrl.o \
- corelib_font.o \
- corelib_gsockgtk.o \
- corelib_minifram.o \
- corelib_pen.o \
- corelib_popupwin.o \
+ corelib_gtk_font.o \
+ corelib_gtk_gsockgtk.o \
+ corelib_gtk_minifram.o \
+ corelib_gtk_pen.o \
+ corelib_gtk_popupwin.o \
corelib_private.o \
- corelib_region.o \
- corelib_renderer.o \
- corelib_settings.o \
- corelib_timer.o \
- corelib_tooltip.o \
- corelib_toplevel.o \
- corelib_utilsgtk.o \
- corelib_win_gtk.o \
- corelib_window.o
+ corelib_gtk_region.o \
+ corelib_gtk_renderer.o \
+ corelib_gtk_settings.o \
+ corelib_gtk_timer.o \
+ corelib_gtk_tooltip.o \
+ corelib_gtk_toplevel.o \
+ corelib_gtk_utilsgtk.o \
+ corelib_gtk_win_gtk.o \
+ corelib_gtk_window.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_7)
COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_7 = \
corelib_fontmgrcmn.o \
- corelib_caret.o \
- corelib_colour.o \
- corelib_icon.o \
- corelib_imaglist.o \
+ corelib_generic_caret.o \
+ corelib_generic_colour.o \
+ corelib_generic_icon.o \
+ corelib_generic_imaglist.o \
corelib_mask.o \
- corelib_timer.o \
- corelib_app.o \
- corelib_bitmap.o \
- corelib_brush.o \
- corelib_clipbrd.o \
- corelib_cursor.o \
- corelib_data.o \
- corelib_dc.o \
- corelib_dcclient.o \
- corelib_dcmemory.o \
- corelib_dcscreen.o \
+ corelib_generic_timer.o \
+ corelib_mgl_app.o \
+ corelib_mgl_bitmap.o \
+ corelib_mgl_brush.o \
+ corelib_mgl_clipbrd.o \
+ corelib_mgl_cursor.o \
+ corelib_mgl_data.o \
+ corelib_mgl_dc.o \
+ corelib_mgl_dcclient.o \
+ corelib_mgl_dcmemory.o \
+ corelib_mgl_dcscreen.o \
corelib_dirmgl.o \
- corelib_evtloop.o \
- corelib_font.o \
- corelib_fontenum.o \
- corelib_fontmgr.o \
- corelib_fontutil.o \
- corelib_palette.o \
- corelib_pen.o \
- corelib_region.o \
- corelib_settings.o \
- corelib_toplevel.o \
- corelib_utils.o \
- corelib_window.o
+ corelib_mgl_evtloop.o \
+ corelib_mgl_font.o \
+ corelib_mgl_fontenum.o \
+ corelib_mgl_fontmgr.o \
+ corelib_mgl_fontutil.o \
+ corelib_mgl_palette.o \
+ corelib_mgl_pen.o \
+ corelib_mgl_region.o \
+ corelib_mgl_settings.o \
+ corelib_mgl_toplevel.o \
+ corelib_mgl_utils.o \
+ corelib_mgl_window.o
@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_7)
COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_7 = \
- corelib_caret.o \
- corelib_imaglist.o \
- corelib_dialup.o \
- corelib_fontenum.o \
- corelib_fontutil.o \
+ corelib_generic_caret.o \
+ corelib_generic_imaglist.o \
+ corelib_unix_dialup.o \
+ corelib_unix_fontenum.o \
+ corelib_unix_fontutil.o \
corelib_utilsx11.o \
corelib_displayx11.o \
- corelib_bitmap.o \
- corelib_brush.o \
- corelib_palette.o \
- corelib_pen.o \
- corelib_region.o \
+ corelib_x11_bitmap.o \
+ corelib_x11_brush.o \
+ corelib_x11_palette.o \
+ corelib_x11_pen.o \
+ corelib_x11_region.o \
corelib_utilsx.o
@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_7)
COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 = \
- corelib_app.o \
- corelib_bitmap.o \
- corelib_brush.o \
- corelib_caret.o \
- corelib_clipbrd.o \
- corelib_colour.o \
- corelib_cursor.o \
- corelib_data.o \
- corelib_dc.o \
- corelib_dcclient.o \
- corelib_dcmemory.o \
- corelib_dcprint.o \
- corelib_dcscreen.o \
- corelib_dialup.o \
+ corelib_msw_app.o \
+ corelib_msw_bitmap.o \
+ corelib_msw_brush.o \
+ corelib_msw_caret.o \
+ corelib_msw_clipbrd.o \
+ corelib_msw_colour.o \
+ corelib_msw_cursor.o \
+ corelib_msw_data.o \
+ corelib_msw_dc.o \
+ corelib_msw_dcclient.o \
+ corelib_msw_dcmemory.o \
+ corelib_msw_dcprint.o \
+ corelib_msw_dcscreen.o \
+ corelib_msw_dialup.o \
corelib_dib.o \
- corelib_display.o \
+ corelib_msw_display.o \
corelib_enhmeta.o \
- corelib_font.o \
- corelib_fontenum.o \
- corelib_fontutil.o \
- corelib_gdiimage.o \
- corelib_gdiobj.o \
+ corelib_msw_font.o \
+ corelib_msw_fontenum.o \
+ corelib_msw_fontutil.o \
+ corelib_msw_gdiimage.o \
+ corelib_msw_gdiobj.o \
corelib_gdiplus.o \
- corelib_graphics.o \
- corelib_icon.o \
- corelib_imaglist.o \
- corelib_minifram.o \
- corelib_dataobj.o \
+ corelib_msw_graphics.o \
+ corelib_msw_icon.o \
+ corelib_msw_imaglist.o \
+ corelib_msw_minifram.o \
+ corelib_ole_dataobj.o \
corelib_dropsrc.o \
corelib_droptgt.o \
corelib_oleutils.o \
- corelib_palette.o \
- corelib_pen.o \
- corelib_popupwin.o \
- corelib_printdlg.o \
+ corelib_msw_palette.o \
+ corelib_msw_pen.o \
+ corelib_msw_popupwin.o \
+ corelib_msw_printdlg.o \
corelib_printwin.o \
- corelib_region.o \
- corelib_renderer.o \
- corelib_settings.o \
- corelib_tooltip.o \
- corelib_toplevel.o \
- corelib_utilsgui.o \
+ corelib_msw_region.o \
+ corelib_msw_renderer.o \
+ corelib_msw_settings.o \
+ corelib_msw_tooltip.o \
+ corelib_msw_toplevel.o \
+ corelib_msw_utilsgui.o \
corelib_uxtheme.o \
- corelib_window.o \
+ corelib_msw_window.o \
corelib_helpchm.o \
- corelib_helpwin.o \
+ corelib_msw_helpwin.o \
corelib_automtn.o \
corelib_uuid.o
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7)
@@ -10789,87 +10855,87 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 = \
@COND_TOOLKIT_OSX_COCOA@ $(__OSX_LOWLEVEL_SRC_OBJECTS_1_4)
@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_7 =
COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_7 = \
- corelib_app.o \
- corelib_bitmap.o \
- corelib_brush.o \
- corelib_caret.o \
- corelib_clipbrd.o \
- corelib_colour.o \
- corelib_cursor.o \
- corelib_data.o \
- corelib_dc.o \
- corelib_dcclient.o \
- corelib_dcmemory.o \
- corelib_dcprint.o \
- corelib_dcscreen.o \
- corelib_dialup.o \
+ corelib_msw_app.o \
+ corelib_msw_bitmap.o \
+ corelib_msw_brush.o \
+ corelib_msw_caret.o \
+ corelib_msw_clipbrd.o \
+ corelib_msw_colour.o \
+ corelib_msw_cursor.o \
+ corelib_msw_data.o \
+ corelib_msw_dc.o \
+ corelib_msw_dcclient.o \
+ corelib_msw_dcmemory.o \
+ corelib_msw_dcprint.o \
+ corelib_msw_dcscreen.o \
+ corelib_msw_dialup.o \
corelib_dib.o \
- corelib_display.o \
+ corelib_msw_display.o \
corelib_enhmeta.o \
- corelib_font.o \
- corelib_fontenum.o \
- corelib_fontutil.o \
- corelib_gdiimage.o \
- corelib_gdiobj.o \
+ corelib_msw_font.o \
+ corelib_msw_fontenum.o \
+ corelib_msw_fontutil.o \
+ corelib_msw_gdiimage.o \
+ corelib_msw_gdiobj.o \
corelib_gdiplus.o \
- corelib_graphics.o \
- corelib_icon.o \
- corelib_imaglist.o \
- corelib_minifram.o \
- corelib_dataobj.o \
+ corelib_msw_graphics.o \
+ corelib_msw_icon.o \
+ corelib_msw_imaglist.o \
+ corelib_msw_minifram.o \
+ corelib_ole_dataobj.o \
corelib_dropsrc.o \
corelib_droptgt.o \
corelib_oleutils.o \
- corelib_palette.o \
- corelib_pen.o \
- corelib_popupwin.o \
- corelib_printdlg.o \
+ corelib_msw_palette.o \
+ corelib_msw_pen.o \
+ corelib_msw_popupwin.o \
+ corelib_msw_printdlg.o \
corelib_printwin.o \
- corelib_region.o \
- corelib_renderer.o \
- corelib_settings.o \
- corelib_tooltip.o \
- corelib_toplevel.o \
- corelib_utilsgui.o \
+ corelib_msw_region.o \
+ corelib_msw_renderer.o \
+ corelib_msw_settings.o \
+ corelib_msw_tooltip.o \
+ corelib_msw_toplevel.o \
+ corelib_msw_utilsgui.o \
corelib_uxtheme.o \
- corelib_window.o
+ corelib_msw_window.o
@COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_7)
COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7 = \
- corelib_caret.o \
- corelib_imaglist.o \
- corelib_dialup.o \
- corelib_fontenum.o \
- corelib_fontutil.o \
+ corelib_generic_caret.o \
+ corelib_generic_imaglist.o \
+ corelib_unix_dialup.o \
+ corelib_unix_fontenum.o \
+ corelib_unix_fontutil.o \
corelib_utilsx11.o \
corelib_displayx11.o \
- corelib_icon.o \
- corelib_timer.o \
- corelib_app.o \
- corelib_bitmap.o \
- corelib_brush.o \
- corelib_clipbrd.o \
- corelib_colour.o \
- corelib_cursor.o \
- corelib_data.o \
- corelib_dataobj.o \
- corelib_dc.o \
- corelib_dcclient.o \
- corelib_dcmemory.o \
- corelib_dcscreen.o \
- corelib_evtloop.o \
- corelib_font.o \
- corelib_minifram.o \
+ corelib_generic_icon.o \
+ corelib_generic_timer.o \
+ corelib_x11_app.o \
+ corelib_x11_bitmap.o \
+ corelib_x11_brush.o \
+ corelib_x11_clipbrd.o \
+ corelib_x11_colour.o \
+ corelib_x11_cursor.o \
+ corelib_x11_data.o \
+ corelib_x11_dataobj.o \
+ corelib_x11_dc.o \
+ corelib_x11_dcclient.o \
+ corelib_x11_dcmemory.o \
+ corelib_x11_dcscreen.o \
+ corelib_x11_evtloop.o \
+ corelib_x11_font.o \
+ corelib_x11_minifram.o \
corelib_nanox.o \
- corelib_palette.o \
- corelib_pen.o \
- corelib_popupwin.o \
- corelib_region.o \
+ corelib_x11_palette.o \
+ corelib_x11_pen.o \
+ corelib_x11_popupwin.o \
+ corelib_x11_region.o \
corelib_reparent.o \
- corelib_settings.o \
- corelib_toplevel.o \
- corelib_utils.o \
+ corelib_x11_settings.o \
+ corelib_x11_toplevel.o \
+ corelib_x11_utils.o \
corelib_utilsx.o \
- corelib_window.o
+ corelib_x11_window.o
@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7)
@COND_SHARED_1@____wxcore_namedll_DEP = $(__coredll___depname)
@COND_SHARED_0@____wxcore_namelib_DEP = $(__corelib___depname)
@@ -10889,11 +10955,11 @@ COND_PLATFORM_OS2_1___advdll___importlib = -import \
COND_WINDOWS_IMPLIB_1___advdll___importlib = \
-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_WINDOWS_IMPLIB_1@__advdll___importlib = $(COND_WINDOWS_IMPLIB_1___advdll___importlib)
-@COND_GCC_PCH_1@__advdll_PCH_INC = -I.pch/wxprec_advdll
+@COND_GCC_PCH_1@__advdll_PCH_INC = -I./.pch/wxprec_advdll
@COND_ICC_PCH_1@__advdll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_advdll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_advdll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_advdll/wx/wxprec.h.gch
+@COND_ICC_PCH_1@ ./.pch/wxprec_advdll/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_advdll_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@ = ./.pch/wxprec_advdll/wx/wxprec.h.gch
COND_USE_SOVERLINUX_1___advdll___soname_flags = \
$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
@COND_USE_SOVERLINUX_1@__advdll___soname_flags = $(COND_USE_SOVERLINUX_1___advdll___soname_flags)
@@ -10982,19 +11048,25 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_2 = \
advdll_animateg.o
@COND_WXUNIV_1@__ADVANCED_SRC_OBJECTS_2 = $(COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_2)
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 = \
- advdll_aboutdlg.o \
+ advdll_gtk_aboutdlg.o \
advdll_animate.o \
- advdll_bmpcbox.o \
- advdll_calctrl.o \
- advdll_dataview.o \
+ advdll_gtk_bmpcbox.o \
+ advdll_gtk_calctrl.o \
+ advdll_gtk_dataview.o \
advdll_hyperlink.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2)
-@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 \
-@COND_TOOLKIT_MSW@ = advdll_bmpcbox.o advdll_calctrl.o advdll_datecontrols.o \
-@COND_TOOLKIT_MSW@ advdll_datectrl.o
-@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 \
-@COND_TOOLKIT_WINCE@ = advdll_bmpcbox.o advdll_calctrl.o \
-@COND_TOOLKIT_WINCE@ advdll_datecontrols.o advdll_datectrl.o
+COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 = \
+ advdll_msw_bmpcbox.o \
+ advdll_msw_calctrl.o \
+ advdll_datecontrols.o \
+ advdll_datectrl.o
+@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2)
+COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 = \
+ advdll_msw_bmpcbox.o \
+ advdll_msw_calctrl.o \
+ advdll_datecontrols.o \
+ advdll_datectrl.o
+@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2)
@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_2 \
@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@ = advdll_sound_sdl.o
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname = \
@@ -11004,11 +11076,11 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname = \
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ = install_advlib
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__uninstall_advlib___depname \
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ = uninstall_advlib
-@COND_GCC_PCH_1@__advlib_PCH_INC = -I.pch/wxprec_advlib
+@COND_GCC_PCH_1@__advlib_PCH_INC = -I./.pch/wxprec_advlib
@COND_ICC_PCH_1@__advlib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_advlib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_advlib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_advlib/wx/wxprec.h.gch
+@COND_ICC_PCH_1@ ./.pch/wxprec_advlib/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_advlib_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@ = ./.pch/wxprec_advlib/wx/wxprec.h.gch
COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_3 = \
advlib_animatecmn.o \
advlib_bmpcboxcmn.o \
@@ -11066,19 +11138,25 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_3 = \
advlib_animateg.o
@COND_WXUNIV_1@__ADVANCED_SRC_OBJECTS_3 = $(COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_3)
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 = \
- advlib_aboutdlg.o \
+ advlib_gtk_aboutdlg.o \
advlib_animate.o \
- advlib_bmpcbox.o \
- advlib_calctrl.o \
- advlib_dataview.o \
+ advlib_gtk_bmpcbox.o \
+ advlib_gtk_calctrl.o \
+ advlib_gtk_dataview.o \
advlib_hyperlink.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3)
-@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 \
-@COND_TOOLKIT_MSW@ = advlib_bmpcbox.o advlib_calctrl.o advlib_datecontrols.o \
-@COND_TOOLKIT_MSW@ advlib_datectrl.o
-@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 \
-@COND_TOOLKIT_WINCE@ = advlib_bmpcbox.o advlib_calctrl.o \
-@COND_TOOLKIT_WINCE@ advlib_datecontrols.o advlib_datectrl.o
+COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 = \
+ advlib_msw_bmpcbox.o \
+ advlib_msw_calctrl.o \
+ advlib_datecontrols.o \
+ advlib_datectrl.o
+@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3)
+COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 = \
+ advlib_msw_bmpcbox.o \
+ advlib_msw_calctrl.o \
+ advlib_datecontrols.o \
+ advlib_datectrl.o
+@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3)
@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_3 \
@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@ = advlib_sound_sdl.o
@COND_SHARED_1@____wxadv_namedll_DEP = $(__advdll___depname)
@@ -11099,11 +11177,11 @@ COND_PLATFORM_OS2_1___mediadll___importlib = -import \
COND_WINDOWS_IMPLIB_1___mediadll___importlib = \
-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_WINDOWS_IMPLIB_1@__mediadll___importlib = $(COND_WINDOWS_IMPLIB_1___mediadll___importlib)
-@COND_GCC_PCH_1@__mediadll_PCH_INC = -I.pch/wxprec_mediadll
+@COND_GCC_PCH_1@__mediadll_PCH_INC = -I./.pch/wxprec_mediadll
@COND_ICC_PCH_1@__mediadll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_mediadll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_mediadll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_mediadll/wx/wxprec.h.gch
+@COND_ICC_PCH_1@ ./.pch/wxprec_mediadll/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_mediadll_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@ = ./.pch/wxprec_mediadll/wx/wxprec.h.gch
COND_USE_SOVERLINUX_1___mediadll___soname_flags = \
$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
@COND_USE_SOVERLINUX_1@__mediadll___soname_flags = $(COND_USE_SOVERLINUX_1___mediadll___soname_flags)
@@ -11135,9 +11213,12 @@ COND_USE_SOSYMLINKS_1___mediadll___so_symlinks_uninst_cmd = rm -f \
$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_USE_SOSYMLINKS_1@__mediadll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___mediadll___so_symlinks_uninst_cmd)
@COND_PLATFORM_WIN32_1@__mediadll___win32rc = mediadll_version_rc.o
-@COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_2 = mediadll_mediactrl.o
-@COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS_2 = mediadll_mediactrl.o
-@COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS_2 = mediadll_mediactrl.o
+@COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_2 = \
+@COND_TOOLKIT_COCOA@ mediadll_cocoa_mediactrl.o
+@COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS_2 = \
+@COND_TOOLKIT_GTK@ mediadll_unix_mediactrl.o
+@COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS_2 = \
+@COND_TOOLKIT_MOTIF@ mediadll_unix_mediactrl.o
COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_2 = \
mediadll_mediactrl_am.o \
mediadll_mediactrl_wmp10.o \
@@ -11145,7 +11226,7 @@ COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_2 = \
mediadll_activex.o
@COND_TOOLKIT_MSW@__MEDIA_PLATFORM_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_2)
@COND_TOOLKIT_OSX_CARBON@__MEDIA_PLATFORM_SRC_OBJECTS_2 \
-@COND_TOOLKIT_OSX_CARBON@ = mediadll_mediactrl.o
+@COND_TOOLKIT_OSX_CARBON@ = mediadll_carbon_mediactrl.o
@COND_TOOLKIT_OSX_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_2 =
@COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS_2 =
COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS_2 = \
@@ -11154,7 +11235,8 @@ COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS_2 = \
mediadll_mediactrl_qt.o \
mediadll_activex.o
@COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_2 = $(COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS_2)
-@COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS_2 = mediadll_mediactrl.o
+@COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS_2 = \
+@COND_TOOLKIT_X11@ mediadll_unix_mediactrl.o
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1___medialib___depname = \
$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@__medialib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1___medialib___depname)
@@ -11162,14 +11244,17 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1___medialib___depname = \
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@ = install_medialib
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@__uninstall_medialib___depname \
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@ = uninstall_medialib
-@COND_GCC_PCH_1@__medialib_PCH_INC = -I.pch/wxprec_medialib
+@COND_GCC_PCH_1@__medialib_PCH_INC = -I./.pch/wxprec_medialib
@COND_ICC_PCH_1@__medialib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_medialib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_medialib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_medialib/wx/wxprec.h.gch
-@COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_3 = medialib_mediactrl.o
-@COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS_3 = medialib_mediactrl.o
-@COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS_3 = medialib_mediactrl.o
+@COND_ICC_PCH_1@ ./.pch/wxprec_medialib/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_medialib_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@ = ./.pch/wxprec_medialib/wx/wxprec.h.gch
+@COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_3 = \
+@COND_TOOLKIT_COCOA@ medialib_cocoa_mediactrl.o
+@COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS_3 = \
+@COND_TOOLKIT_GTK@ medialib_unix_mediactrl.o
+@COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS_3 = \
+@COND_TOOLKIT_MOTIF@ medialib_unix_mediactrl.o
COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_3 = \
medialib_mediactrl_am.o \
medialib_mediactrl_wmp10.o \
@@ -11177,7 +11262,7 @@ COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_3 = \
medialib_activex.o
@COND_TOOLKIT_MSW@__MEDIA_PLATFORM_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_3)
@COND_TOOLKIT_OSX_CARBON@__MEDIA_PLATFORM_SRC_OBJECTS_3 \
-@COND_TOOLKIT_OSX_CARBON@ = medialib_mediactrl.o
+@COND_TOOLKIT_OSX_CARBON@ = medialib_carbon_mediactrl.o
@COND_TOOLKIT_OSX_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_3 =
@COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS_3 =
COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS_3 = \
@@ -11186,7 +11271,8 @@ COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS_3 = \
medialib_mediactrl_qt.o \
medialib_activex.o
@COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_3 = $(COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS_3)
-@COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS_3 = medialib_mediactrl.o
+@COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS_3 = \
+@COND_TOOLKIT_X11@ medialib_unix_mediactrl.o
@COND_SHARED_1@____wxmedia_namedll_DEP = $(__mediadll___depname)
@COND_SHARED_0@____wxmedia_namelib_DEP = $(__medialib___depname)
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll___depname = \
@@ -11205,11 +11291,11 @@ COND_PLATFORM_OS2_1___htmldll___importlib = -import \
COND_WINDOWS_IMPLIB_1___htmldll___importlib = \
-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_WINDOWS_IMPLIB_1@__htmldll___importlib = $(COND_WINDOWS_IMPLIB_1___htmldll___importlib)
-@COND_GCC_PCH_1@__htmldll_PCH_INC = -I.pch/wxprec_htmldll
+@COND_GCC_PCH_1@__htmldll_PCH_INC = -I./.pch/wxprec_htmldll
@COND_ICC_PCH_1@__htmldll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_htmldll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_htmldll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_htmldll/wx/wxprec.h.gch
+@COND_ICC_PCH_1@ ./.pch/wxprec_htmldll/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_htmldll_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@ = ./.pch/wxprec_htmldll/wx/wxprec.h.gch
COND_USE_SOVERLINUX_1___htmldll___soname_flags = \
$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
@COND_USE_SOVERLINUX_1@__htmldll___soname_flags = $(COND_USE_SOVERLINUX_1___htmldll___soname_flags)
@@ -11251,11 +11337,11 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1___htmllib___depname = \
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@ = install_htmllib
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@__uninstall_htmllib___depname \
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@ = uninstall_htmllib
-@COND_GCC_PCH_1@__htmllib_PCH_INC = -I.pch/wxprec_htmllib
+@COND_GCC_PCH_1@__htmllib_PCH_INC = -I./.pch/wxprec_htmllib
@COND_ICC_PCH_1@__htmllib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_htmllib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_htmllib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_htmllib/wx/wxprec.h.gch
+@COND_ICC_PCH_1@ ./.pch/wxprec_htmllib/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_htmllib_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@ = ./.pch/wxprec_htmllib/wx/wxprec.h.gch
@COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS_3 = htmllib_chm.o
@COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS_3 = htmllib_chm.o
@COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_3 = htmllib_helpbest.o
@@ -11277,11 +11363,11 @@ COND_PLATFORM_OS2_1___qadll___importlib = -import \
COND_WINDOWS_IMPLIB_1___qadll___importlib = \
-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_WINDOWS_IMPLIB_1@__qadll___importlib = $(COND_WINDOWS_IMPLIB_1___qadll___importlib)
-@COND_GCC_PCH_1@__qadll_PCH_INC = -I.pch/wxprec_qadll
+@COND_GCC_PCH_1@__qadll_PCH_INC = -I./.pch/wxprec_qadll
@COND_ICC_PCH_1@__qadll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_qadll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_qadll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_qadll/wx/wxprec.h.gch
+@COND_ICC_PCH_1@ ./.pch/wxprec_qadll/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_qadll_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@ = ./.pch/wxprec_qadll/wx/wxprec.h.gch
COND_USE_SOVERLINUX_1___qadll___soname_flags = \
$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
@COND_USE_SOVERLINUX_1@__qadll___soname_flags = $(COND_USE_SOVERLINUX_1___qadll___soname_flags)
@@ -11320,11 +11406,11 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1___qalib___depname = \
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@ = install_qalib
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@__uninstall_qalib___depname \
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@ = uninstall_qalib
-@COND_GCC_PCH_1@__qalib_PCH_INC = -I.pch/wxprec_qalib
+@COND_GCC_PCH_1@__qalib_PCH_INC = -I./.pch/wxprec_qalib
@COND_ICC_PCH_1@__qalib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_qalib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_qalib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_qalib/wx/wxprec.h.gch
+@COND_ICC_PCH_1@ ./.pch/wxprec_qalib/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_qalib_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@ = ./.pch/wxprec_qalib/wx/wxprec.h.gch
@COND_SHARED_1@____wxqa_namedll_DEP = $(__qadll___depname)
@COND_SHARED_0@____wxqa_namelib_DEP = $(__qalib___depname)
COND_MONOLITHIC_0_SHARED_1___xmldll___depname = \
@@ -11341,11 +11427,11 @@ COND_PLATFORM_OS2_1___xmldll___importlib = -import \
COND_WINDOWS_IMPLIB_1___xmldll___importlib = \
-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_WINDOWS_IMPLIB_1@__xmldll___importlib = $(COND_WINDOWS_IMPLIB_1___xmldll___importlib)
-@COND_GCC_PCH_1@__xmldll_PCH_INC = -I.pch/wxprec_xmldll
+@COND_GCC_PCH_1@__xmldll_PCH_INC = -I./.pch/wxprec_xmldll
@COND_ICC_PCH_1@__xmldll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_xmldll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_xmldll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_xmldll/wx/wxprec.h.gch
+@COND_ICC_PCH_1@ ./.pch/wxprec_xmldll/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_xmldll_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@ = ./.pch/wxprec_xmldll/wx/wxprec.h.gch
COND_USE_SOVERLINUX_1___xmldll___soname_flags = \
$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
@COND_USE_SOVERLINUX_1@__xmldll___soname_flags = $(COND_USE_SOVERLINUX_1___xmldll___soname_flags)
@@ -11382,11 +11468,11 @@ COND_MONOLITHIC_0_SHARED_0___xmllib___depname = \
@COND_MONOLITHIC_0_SHARED_0@__xmllib___depname = $(COND_MONOLITHIC_0_SHARED_0___xmllib___depname)
@COND_MONOLITHIC_0_SHARED_0@__install_xmllib___depname = install_xmllib
@COND_MONOLITHIC_0_SHARED_0@__uninstall_xmllib___depname = uninstall_xmllib
-@COND_GCC_PCH_1@__xmllib_PCH_INC = -I.pch/wxprec_xmllib
+@COND_GCC_PCH_1@__xmllib_PCH_INC = -I./.pch/wxprec_xmllib
@COND_ICC_PCH_1@__xmllib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_xmllib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_xmllib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_xmllib/wx/wxprec.h.gch
+@COND_ICC_PCH_1@ ./.pch/wxprec_xmllib/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_xmllib_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@ = ./.pch/wxprec_xmllib/wx/wxprec.h.gch
@COND_SHARED_1@____wxxml_namedll_DEP = $(__xmldll___depname)
@COND_SHARED_0@____wxxml_namelib_DEP = $(__xmllib___depname)
COND_MONOLITHIC_0_SHARED_1_USE_XRC_1___xrcdll___depname = \
@@ -11405,11 +11491,11 @@ COND_PLATFORM_OS2_1___xrcdll___importlib = -import \
COND_WINDOWS_IMPLIB_1___xrcdll___importlib = \
-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_WINDOWS_IMPLIB_1@__xrcdll___importlib = $(COND_WINDOWS_IMPLIB_1___xrcdll___importlib)
-@COND_GCC_PCH_1@__xrcdll_PCH_INC = -I.pch/wxprec_xrcdll
+@COND_GCC_PCH_1@__xrcdll_PCH_INC = -I./.pch/wxprec_xrcdll
@COND_ICC_PCH_1@__xrcdll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_xrcdll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_xrcdll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_xrcdll/wx/wxprec.h.gch
+@COND_ICC_PCH_1@ ./.pch/wxprec_xrcdll/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_xrcdll_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@ = ./.pch/wxprec_xrcdll/wx/wxprec.h.gch
COND_USE_SOVERLINUX_1___xrcdll___soname_flags = \
$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
@COND_USE_SOVERLINUX_1@__xrcdll___soname_flags = $(COND_USE_SOVERLINUX_1___xrcdll___soname_flags)
@@ -11448,11 +11534,11 @@ COND_MONOLITHIC_0_SHARED_0_USE_XRC_1___xrclib___depname = \
@COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@ = install_xrclib
@COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@__uninstall_xrclib___depname \
@COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@ = uninstall_xrclib
-@COND_GCC_PCH_1@__xrclib_PCH_INC = -I.pch/wxprec_xrclib
+@COND_GCC_PCH_1@__xrclib_PCH_INC = -I./.pch/wxprec_xrclib
@COND_ICC_PCH_1@__xrclib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_xrclib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_xrclib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_xrclib/wx/wxprec.h.gch
+@COND_ICC_PCH_1@ ./.pch/wxprec_xrclib/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_xrclib_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@ = ./.pch/wxprec_xrclib/wx/wxprec.h.gch
@COND_SHARED_1@____wxxrc_namedll_DEP = $(__xrcdll___depname)
@COND_SHARED_0@____wxxrc_namelib_DEP = $(__xrclib___depname)
COND_MONOLITHIC_0_SHARED_1_USE_AUI_1___auidll___depname = \
@@ -11471,11 +11557,11 @@ COND_PLATFORM_OS2_1___auidll___importlib = -import \
COND_WINDOWS_IMPLIB_1___auidll___importlib = \
-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_WINDOWS_IMPLIB_1@__auidll___importlib = $(COND_WINDOWS_IMPLIB_1___auidll___importlib)
-@COND_GCC_PCH_1@__auidll_PCH_INC = -I.pch/wxprec_auidll
+@COND_GCC_PCH_1@__auidll_PCH_INC = -I./.pch/wxprec_auidll
@COND_ICC_PCH_1@__auidll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_auidll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_auidll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_auidll/wx/wxprec.h.gch
+@COND_ICC_PCH_1@ ./.pch/wxprec_auidll/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_auidll_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@ = ./.pch/wxprec_auidll/wx/wxprec.h.gch
COND_USE_SOVERLINUX_1___auidll___soname_flags = \
$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
@COND_USE_SOVERLINUX_1@__auidll___soname_flags = $(COND_USE_SOVERLINUX_1___auidll___soname_flags)
@@ -11514,11 +11600,11 @@ COND_MONOLITHIC_0_SHARED_0_USE_AUI_1___auilib___depname = \
@COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@ = install_auilib
@COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@__uninstall_auilib___depname \
@COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@ = uninstall_auilib
-@COND_GCC_PCH_1@__auilib_PCH_INC = -I.pch/wxprec_auilib
+@COND_GCC_PCH_1@__auilib_PCH_INC = -I./.pch/wxprec_auilib
@COND_ICC_PCH_1@__auilib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_auilib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_auilib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_auilib/wx/wxprec.h.gch
+@COND_ICC_PCH_1@ ./.pch/wxprec_auilib/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_auilib_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@ = ./.pch/wxprec_auilib/wx/wxprec.h.gch
@COND_SHARED_1@____wxaui_namedll_DEP = $(__auidll___depname)
@COND_SHARED_0@____wxaui_namelib_DEP = $(__auilib___depname)
COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1___propgriddll___depname = \
@@ -11537,11 +11623,11 @@ COND_PLATFORM_OS2_1___propgriddll___importlib = -import \
COND_WINDOWS_IMPLIB_1___propgriddll___importlib = \
-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_WINDOWS_IMPLIB_1@__propgriddll___importlib = $(COND_WINDOWS_IMPLIB_1___propgriddll___importlib)
-@COND_GCC_PCH_1@__propgriddll_PCH_INC = -I.pch/wxprec_propgriddll
+@COND_GCC_PCH_1@__propgriddll_PCH_INC = -I./.pch/wxprec_propgriddll
@COND_ICC_PCH_1@__propgriddll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_propgriddll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_propgriddll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_propgriddll/wx/wxprec.h.gch
+@COND_ICC_PCH_1@ ./.pch/wxprec_propgriddll/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_propgriddll_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@ = ./.pch/wxprec_propgriddll/wx/wxprec.h.gch
COND_USE_SOVERLINUX_1___propgriddll___soname_flags = \
$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
@COND_USE_SOVERLINUX_1@__propgriddll___soname_flags = $(COND_USE_SOVERLINUX_1___propgriddll___soname_flags)
@@ -11581,11 +11667,11 @@ COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1___propgridlib___depname = \
@COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1@ = install_propgridlib
@COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1@__uninstall_propgridlib___depname \
@COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1@ = uninstall_propgridlib
-@COND_GCC_PCH_1@__propgridlib_PCH_INC = -I.pch/wxprec_propgridlib
+@COND_GCC_PCH_1@__propgridlib_PCH_INC = -I./.pch/wxprec_propgridlib
@COND_ICC_PCH_1@__propgridlib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_propgridlib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_propgridlib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_propgridlib/wx/wxprec.h.gch
+@COND_ICC_PCH_1@ ./.pch/wxprec_propgridlib/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_propgridlib_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@ = ./.pch/wxprec_propgridlib/wx/wxprec.h.gch
@COND_SHARED_1@____wxpropgrid_namedll_DEP = $(__propgriddll___depname)
@COND_SHARED_0@____wxpropgrid_namelib_DEP = $(__propgridlib___depname)
COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1___richtextdll___depname = \
@@ -11604,11 +11690,11 @@ COND_PLATFORM_OS2_1___richtextdll___importlib = -import \
COND_WINDOWS_IMPLIB_1___richtextdll___importlib = \
-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_WINDOWS_IMPLIB_1@__richtextdll___importlib = $(COND_WINDOWS_IMPLIB_1___richtextdll___importlib)
-@COND_GCC_PCH_1@__richtextdll_PCH_INC = -I.pch/wxprec_richtextdll
+@COND_GCC_PCH_1@__richtextdll_PCH_INC = -I./.pch/wxprec_richtextdll
@COND_ICC_PCH_1@__richtextdll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_richtextdll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_richtextdll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_richtextdll/wx/wxprec.h.gch
+@COND_ICC_PCH_1@ ./.pch/wxprec_richtextdll/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_richtextdll_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@ = ./.pch/wxprec_richtextdll/wx/wxprec.h.gch
COND_USE_SOVERLINUX_1___richtextdll___soname_flags = \
$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
@COND_USE_SOVERLINUX_1@__richtextdll___soname_flags = $(COND_USE_SOVERLINUX_1___richtextdll___soname_flags)
@@ -11648,11 +11734,11 @@ COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1___richtextlib___depname = \
@COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@ = install_richtextlib
@COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@__uninstall_richtextlib___depname \
@COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@ = uninstall_richtextlib
-@COND_GCC_PCH_1@__richtextlib_PCH_INC = -I.pch/wxprec_richtextlib
+@COND_GCC_PCH_1@__richtextlib_PCH_INC = -I./.pch/wxprec_richtextlib
@COND_ICC_PCH_1@__richtextlib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_richtextlib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_richtextlib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_richtextlib/wx/wxprec.h.gch
+@COND_ICC_PCH_1@ ./.pch/wxprec_richtextlib/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_richtextlib_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@ = ./.pch/wxprec_richtextlib/wx/wxprec.h.gch
@COND_SHARED_1@____wxrichtext_namedll_DEP = $(__richtextdll___depname)
@COND_SHARED_0@____wxrichtext_namelib_DEP = $(__richtextlib___depname)
COND_MONOLITHIC_0_SHARED_1_USE_STC_1___stcdll___depname = \
@@ -11671,11 +11757,11 @@ COND_PLATFORM_OS2_1___stcdll___importlib = -import \
COND_WINDOWS_IMPLIB_1___stcdll___importlib = \
-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_WINDOWS_IMPLIB_1@__stcdll___importlib = $(COND_WINDOWS_IMPLIB_1___stcdll___importlib)
-@COND_GCC_PCH_1@__stcdll_PCH_INC = -I.pch/wxprec_stcdll
+@COND_GCC_PCH_1@__stcdll_PCH_INC = -I./.pch/wxprec_stcdll
@COND_ICC_PCH_1@__stcdll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_stcdll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_stcdll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_stcdll/wx/wxprec.h.gch
+@COND_ICC_PCH_1@ ./.pch/wxprec_stcdll/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_stcdll_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@ = ./.pch/wxprec_stcdll/wx/wxprec.h.gch
COND_USE_SOVERLINUX_1___stcdll___soname_flags = \
$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
@COND_USE_SOVERLINUX_1@__stcdll___soname_flags = $(COND_USE_SOVERLINUX_1___stcdll___soname_flags)
@@ -11714,11 +11800,11 @@ COND_MONOLITHIC_0_SHARED_0_USE_STC_1___stclib___depname = \
@COND_MONOLITHIC_0_SHARED_0_USE_STC_1@ = install_stclib
@COND_MONOLITHIC_0_SHARED_0_USE_STC_1@__uninstall_stclib___depname \
@COND_MONOLITHIC_0_SHARED_0_USE_STC_1@ = uninstall_stclib
-@COND_GCC_PCH_1@__stclib_PCH_INC = -I.pch/wxprec_stclib
+@COND_GCC_PCH_1@__stclib_PCH_INC = -I./.pch/wxprec_stclib
@COND_ICC_PCH_1@__stclib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_stclib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_stclib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_stclib/wx/wxprec.h.gch
+@COND_ICC_PCH_1@ ./.pch/wxprec_stclib/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_stclib_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@ = ./.pch/wxprec_stclib/wx/wxprec.h.gch
@COND_SHARED_1@____wxstc_namedll_DEP = $(__stcdll___depname)
@COND_SHARED_0@____wxstc_namelib_DEP = $(__stclib___depname)
COND_SHARED_1_USE_GUI_1_USE_OPENGL_1___gldll___depname = \
@@ -11737,11 +11823,11 @@ COND_PLATFORM_OS2_1___gldll___importlib = -import \
COND_WINDOWS_IMPLIB_1___gldll___importlib = \
-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_WINDOWS_IMPLIB_1@__gldll___importlib = $(COND_WINDOWS_IMPLIB_1___gldll___importlib)
-@COND_GCC_PCH_1@__gldll_PCH_INC = -I.pch/wxprec_gldll
+@COND_GCC_PCH_1@__gldll_PCH_INC = -I./.pch/wxprec_gldll
@COND_ICC_PCH_1@__gldll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_gldll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_gldll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_gldll/wx/wxprec.h.gch
+@COND_ICC_PCH_1@ ./.pch/wxprec_gldll/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_gldll_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@ = ./.pch/wxprec_gldll/wx/wxprec.h.gch
COND_USE_SOVERLINUX_1___gldll___soname_flags = \
$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
@COND_USE_SOVERLINUX_1@__gldll___soname_flags = $(COND_USE_SOVERLINUX_1___gldll___soname_flags)
@@ -11773,22 +11859,23 @@ COND_USE_SOSYMLINKS_1___gldll___so_symlinks_uninst_cmd = rm -f \
$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_USE_SOSYMLINKS_1@__gldll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___gldll___so_symlinks_uninst_cmd)
@COND_PLATFORM_WIN32_1@__gldll___win32rc = gldll_version_rc.o
-@COND_TOOLKIT_COCOA@__OPENGL_SRC_PLATFORM_OBJECTS = gldll_glcanvas.o
+@COND_TOOLKIT_COCOA@__OPENGL_SRC_PLATFORM_OBJECTS = \
+@COND_TOOLKIT_COCOA@ gldll_src_cocoa_glcanvas.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__OPENGL_SRC_PLATFORM_OBJECTS \
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ = gldll_glcanvas.o gldll_glx11.o
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ = gldll_gtk1_glcanvas.o gldll_glx11.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__OPENGL_SRC_PLATFORM_OBJECTS \
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = gldll_glcanvas.o gldll_glx11.o
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = gldll_gtk_glcanvas.o gldll_glx11.o
@COND_TOOLKIT_MOTIF@__OPENGL_SRC_PLATFORM_OBJECTS = \
-@COND_TOOLKIT_MOTIF@ gldll_glcanvas.o gldll_glx11.o
-@COND_TOOLKIT_MSW@__OPENGL_SRC_PLATFORM_OBJECTS = gldll_glcanvas.o
+@COND_TOOLKIT_MOTIF@ gldll_x11_glcanvas.o gldll_glx11.o
+@COND_TOOLKIT_MSW@__OPENGL_SRC_PLATFORM_OBJECTS = gldll_msw_glcanvas.o
@COND_TOOLKIT_OSX_CARBON@__OPENGL_SRC_PLATFORM_OBJECTS \
-@COND_TOOLKIT_OSX_CARBON@ = gldll_glcanvas.o gldll_glcanvas_osx.o
+@COND_TOOLKIT_OSX_CARBON@ = gldll_carbon_glcanvas.o gldll_glcanvas_osx.o
@COND_TOOLKIT_OSX_COCOA@__OPENGL_SRC_PLATFORM_OBJECTS \
-@COND_TOOLKIT_OSX_COCOA@ = gldll_glcanvas.o gldll_glcanvas_osx.o
-@COND_TOOLKIT_PM@__OPENGL_SRC_PLATFORM_OBJECTS = gldll_glcanvas.o
-@COND_TOOLKIT_WINCE@__OPENGL_SRC_PLATFORM_OBJECTS = gldll_glcanvas.o
+@COND_TOOLKIT_OSX_COCOA@ = gldll_osx_cocoa_glcanvas.o gldll_glcanvas_osx.o
+@COND_TOOLKIT_PM@__OPENGL_SRC_PLATFORM_OBJECTS = gldll_os2_glcanvas.o
+@COND_TOOLKIT_WINCE@__OPENGL_SRC_PLATFORM_OBJECTS = gldll_msw_glcanvas.o
@COND_TOOLKIT_X11@__OPENGL_SRC_PLATFORM_OBJECTS = \
-@COND_TOOLKIT_X11@ gldll_glcanvas.o gldll_glx11.o
+@COND_TOOLKIT_X11@ gldll_x11_glcanvas.o gldll_glx11.o
COND_MONOLITHIC_0___WXLIBGLDEP_CORE_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_0@__WXLIBGLDEP_CORE_p = $(COND_MONOLITHIC_0___WXLIBGLDEP_CORE_p)
@@ -11805,27 +11892,28 @@ COND_SHARED_0_USE_GUI_1_USE_OPENGL_1___gllib___depname = \
@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ = install_gllib
@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@__uninstall_gllib___depname \
@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ = uninstall_gllib
-@COND_GCC_PCH_1@__gllib_PCH_INC = -I.pch/wxprec_gllib
+@COND_GCC_PCH_1@__gllib_PCH_INC = -I./.pch/wxprec_gllib
@COND_ICC_PCH_1@__gllib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_gllib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_gllib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_gllib/wx/wxprec.h.gch
-@COND_TOOLKIT_COCOA@__OPENGL_SRC_PLATFORM_OBJECTS_1 = gllib_glcanvas.o
+@COND_ICC_PCH_1@ ./.pch/wxprec_gllib/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_gllib_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@ = ./.pch/wxprec_gllib/wx/wxprec.h.gch
+@COND_TOOLKIT_COCOA@__OPENGL_SRC_PLATFORM_OBJECTS_1 = \
+@COND_TOOLKIT_COCOA@ gllib_src_cocoa_glcanvas.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__OPENGL_SRC_PLATFORM_OBJECTS_1 \
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ = gllib_glcanvas.o gllib_glx11.o
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ = gllib_gtk1_glcanvas.o gllib_glx11.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__OPENGL_SRC_PLATFORM_OBJECTS_1 \
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = gllib_glcanvas.o gllib_glx11.o
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = gllib_gtk_glcanvas.o gllib_glx11.o
@COND_TOOLKIT_MOTIF@__OPENGL_SRC_PLATFORM_OBJECTS_1 = \
-@COND_TOOLKIT_MOTIF@ gllib_glcanvas.o gllib_glx11.o
-@COND_TOOLKIT_MSW@__OPENGL_SRC_PLATFORM_OBJECTS_1 = gllib_glcanvas.o
+@COND_TOOLKIT_MOTIF@ gllib_x11_glcanvas.o gllib_glx11.o
+@COND_TOOLKIT_MSW@__OPENGL_SRC_PLATFORM_OBJECTS_1 = gllib_msw_glcanvas.o
@COND_TOOLKIT_OSX_CARBON@__OPENGL_SRC_PLATFORM_OBJECTS_1 \
-@COND_TOOLKIT_OSX_CARBON@ = gllib_glcanvas.o gllib_glcanvas_osx.o
+@COND_TOOLKIT_OSX_CARBON@ = gllib_carbon_glcanvas.o gllib_glcanvas_osx.o
@COND_TOOLKIT_OSX_COCOA@__OPENGL_SRC_PLATFORM_OBJECTS_1 \
-@COND_TOOLKIT_OSX_COCOA@ = gllib_glcanvas.o gllib_glcanvas_osx.o
-@COND_TOOLKIT_PM@__OPENGL_SRC_PLATFORM_OBJECTS_1 = gllib_glcanvas.o
-@COND_TOOLKIT_WINCE@__OPENGL_SRC_PLATFORM_OBJECTS_1 = gllib_glcanvas.o
+@COND_TOOLKIT_OSX_COCOA@ = gllib_osx_cocoa_glcanvas.o gllib_glcanvas_osx.o
+@COND_TOOLKIT_PM@__OPENGL_SRC_PLATFORM_OBJECTS_1 = gllib_os2_glcanvas.o
+@COND_TOOLKIT_WINCE@__OPENGL_SRC_PLATFORM_OBJECTS_1 = gllib_msw_glcanvas.o
@COND_TOOLKIT_X11@__OPENGL_SRC_PLATFORM_OBJECTS_1 = \
-@COND_TOOLKIT_X11@ gllib_glcanvas.o gllib_glx11.o
+@COND_TOOLKIT_X11@ gllib_x11_glcanvas.o gllib_glx11.o
@COND_SHARED_1@____wxgl_namedll_DEP = $(__gldll___depname)
@COND_SHARED_0@____wxgl_namelib_DEP = $(__gllib___depname)
COND_WITH_PLUGIN_SDL_1___sound_sdl___depname = \
@@ -11847,55 +11935,54 @@ COND_WITH_PLUGIN_SDL_1___sound_sdl___depname = \
COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS = \
monodll_colordlgosx.o \
monodll_fontdlgosx.o \
- monodll_clipbrd.o \
- monodll_cursor.o \
- monodll_fontdlg.o \
- monodll_gdiobj.o \
- monodll_icon.o \
- monodll_app.o \
- monodll_combobox.o \
- monodll_control.o \
- monodll_dataobj.o \
- monodll_dcclient.o \
- monodll_dcprint.o \
- monodll_dcscreen.o \
- monodll_glgrab.o \
- monodll_graphics.o \
- monodll_dnd.o \
- monodll_font.o \
- monodll_frame.o \
- monodll_mdi.o \
- monodll_metafile.o \
- monodll_overlay.o \
- monodll_popupwin.o \
- monodll_printdlg.o \
- monodll_renderer.o \
- monodll_settings.o \
+ monodll_carbon_clipbrd.o \
+ monodll_carbon_cursor.o \
+ monodll_carbon_fontdlg.o \
+ monodll_carbon_gdiobj.o \
+ monodll_carbon_icon.o \
+ monodll_carbon_app.o \
+ monodll_carbon_combobox.o \
+ monodll_carbon_control.o \
+ monodll_carbon_dataobj.o \
+ monodll_carbon_dcclient.o \
+ monodll_carbon_dcprint.o \
+ monodll_carbon_dcscreen.o \
+ monodll_carbon_graphics.o \
+ monodll_carbon_dnd.o \
+ monodll_carbon_font.o \
+ monodll_carbon_frame.o \
+ monodll_carbon_mdi.o \
+ monodll_carbon_metafile.o \
+ monodll_carbon_overlay.o \
+ monodll_carbon_popupwin.o \
+ monodll_carbon_printdlg.o \
+ monodll_carbon_renderer.o \
+ monodll_carbon_settings.o \
monodll_statbrma.o \
- monodll_tabctrl.o \
+ monodll_carbon_tabctrl.o \
monodll_utilscocoa.o
@COND_PLATFORM_MACOSX_1@__OSX_CARBON_COCOA_SRC_OBJECTS = $(COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS)
COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS = \
- monodll_accel.o \
+ monodll_osx_accel.o \
monodll_artmac.o \
monodll_bmpbuttn_osx.o \
- monodll_brush.o \
+ monodll_osx_brush.o \
monodll_button_osx.o \
monodll_checkbox_osx.o \
monodll_checklst_osx.o \
monodll_choice_osx.o \
monodll_dialog_osx.o \
- monodll_fontutil.o \
+ monodll_osx_fontutil.o \
monodll_gauge_osx.o \
- monodll_imaglist.o \
+ monodll_osx_imaglist.o \
monodll_listbox_osx.o \
monodll_menu_osx.o \
monodll_menuitem_osx.o \
- monodll_minifram.o \
+ monodll_osx_minifram.o \
monodll_nonownedwnd_osx.o \
monodll_notebook_osx.o \
- monodll_palette.o \
- monodll_pen.o \
+ monodll_osx_palette.o \
+ monodll_osx_pen.o \
monodll_radiobox_osx.o \
monodll_radiobut_osx.o \
monodll_scrolbar_osx.o \
@@ -11913,94 +12000,95 @@ COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS = \
monodll_toplevel_osx.o \
monodll_utils_osx.o \
monodll_window_osx.o \
- monodll_bitmap.o \
- monodll_colour.o \
- monodll_dcmemory.o \
- monodll_display.o \
- monodll_fontenum.o \
+ monodll_core_bitmap.o \
+ monodll_core_colour.o \
+ monodll_core_dcmemory.o \
+ monodll_core_display.o \
+ monodll_core_fontenum.o \
monodll_hid.o \
monodll_printmac.o \
- monodll_timer.o \
+ monodll_core_timer.o \
monodll_utilsexc_cf.o
@COND_PLATFORM_MACOSX_1@__OSX_LOWLEVEL_SRC_OBJECTS = $(COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS)
COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS = \
monodll_taskbarcmn.o \
- monodll_joystick.o \
- monodll_sound.o \
+ monodll_unix_joystick.o \
+ monodll_unix_sound.o \
monodll_taskbarx11.o
@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS)
COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS = \
- monodll_taskbar.o \
+ monodll_src_cocoa_taskbar.o \
monodll_taskbarcmn.o \
monodll_animateg.o \
monodll_hidjoystick.o
@COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS)
COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS = \
monodll_taskbarcmn.o \
- monodll_joystick.o \
- monodll_sound.o \
+ monodll_unix_joystick.o \
+ monodll_unix_sound.o \
monodll_taskbarx11.o \
monodll_animateg.o \
- monodll_eggtrayicon.o \
- monodll_taskbar.o
+ monodll_gtk1_eggtrayicon.o \
+ monodll_gtk1_taskbar.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS)
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS = \
monodll_taskbarcmn.o \
- monodll_joystick.o \
- monodll_sound.o \
+ monodll_unix_joystick.o \
+ monodll_unix_sound.o \
monodll_taskbarx11.o \
- monodll_taskbar.o \
- monodll_eggtrayicon.o \
- monodll_notifmsg.o
+ monodll_gtk_taskbar.o \
+ monodll_gtk_eggtrayicon.o \
+ monodll_hildon_notifmsg.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS)
COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS = \
monodll_taskbarcmn.o \
- monodll_joystick.o \
- monodll_sound.o \
+ monodll_unix_joystick.o \
+ monodll_unix_sound.o \
monodll_taskbarx11.o \
monodll_animateg.o
@COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS)
COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS = \
monodll_taskbarcmn.o \
monodll_animateg.o \
- monodll_aboutdlg.o \
- monodll_notifmsg.o \
- monodll_sound.o \
- monodll_taskbar.o \
- monodll_joystick.o
+ monodll_msw_aboutdlg.o \
+ monodll_msw_notifmsg.o \
+ monodll_msw_sound.o \
+ monodll_msw_taskbar.o \
+ monodll_msw_joystick.o
@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS)
COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS = \
monodll_taskbarcmn.o \
monodll_animateg.o \
- monodll_aboutdlg.o \
- monodll_drawer.o \
- monodll_dataview.o \
+ monodll_carbon_aboutdlg.o \
+ monodll_carbon_drawer.o \
+ monodll_carbon_dataview.o \
monodll_databrow.o \
- monodll_sound.o \
- monodll_taskbar.o \
+ monodll_carbon_sound.o \
+ monodll_carbon_taskbar.o \
monodll_hidjoystick.o
@COND_TOOLKIT_OSX_CARBON@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS)
COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS = \
monodll_taskbarcmn.o \
monodll_animateg.o \
- monodll_aboutdlg.o \
- monodll_taskbar.o \
+ monodll_cocoa_aboutdlg.o \
+ monodll_osx_cocoa_taskbar.o \
monodll_hidjoystick.o
@COND_TOOLKIT_OSX_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS)
@COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS = \
-@COND_TOOLKIT_PM@ monodll_animateg.o monodll_joystick.o monodll_sound.o
+@COND_TOOLKIT_PM@ monodll_animateg.o monodll_os2_joystick.o \
+@COND_TOOLKIT_PM@ monodll_os2_sound.o
COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS = \
monodll_taskbarcmn.o \
monodll_animateg.o \
- monodll_aboutdlg.o \
- monodll_notifmsg.o \
- monodll_sound.o \
- monodll_taskbar.o
+ monodll_msw_aboutdlg.o \
+ monodll_msw_notifmsg.o \
+ monodll_msw_sound.o \
+ monodll_msw_taskbar.o
@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS)
COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS = \
monodll_taskbarcmn.o \
- monodll_joystick.o \
- monodll_sound.o \
+ monodll_unix_joystick.o \
+ monodll_unix_sound.o \
monodll_taskbarx11.o
@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS)
@COND_PLATFORM_MACOSX_1@__PLATFORM_SRC_OBJECTS_0 = monolib_apptraits.o
@@ -12008,55 +12096,54 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS = \
COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_0 = \
monolib_colordlgosx.o \
monolib_fontdlgosx.o \
- monolib_clipbrd.o \
- monolib_cursor.o \
- monolib_fontdlg.o \
- monolib_gdiobj.o \
- monolib_icon.o \
- monolib_app.o \
- monolib_combobox.o \
- monolib_control.o \
- monolib_dataobj.o \
- monolib_dcclient.o \
- monolib_dcprint.o \
- monolib_dcscreen.o \
- monolib_glgrab.o \
- monolib_graphics.o \
- monolib_dnd.o \
- monolib_font.o \
- monolib_frame.o \
- monolib_mdi.o \
- monolib_metafile.o \
- monolib_overlay.o \
- monolib_popupwin.o \
- monolib_printdlg.o \
- monolib_renderer.o \
- monolib_settings.o \
+ monolib_carbon_clipbrd.o \
+ monolib_carbon_cursor.o \
+ monolib_carbon_fontdlg.o \
+ monolib_carbon_gdiobj.o \
+ monolib_carbon_icon.o \
+ monolib_carbon_app.o \
+ monolib_carbon_combobox.o \
+ monolib_carbon_control.o \
+ monolib_carbon_dataobj.o \
+ monolib_carbon_dcclient.o \
+ monolib_carbon_dcprint.o \
+ monolib_carbon_dcscreen.o \
+ monolib_carbon_graphics.o \
+ monolib_carbon_dnd.o \
+ monolib_carbon_font.o \
+ monolib_carbon_frame.o \
+ monolib_carbon_mdi.o \
+ monolib_carbon_metafile.o \
+ monolib_carbon_overlay.o \
+ monolib_carbon_popupwin.o \
+ monolib_carbon_printdlg.o \
+ monolib_carbon_renderer.o \
+ monolib_carbon_settings.o \
monolib_statbrma.o \
- monolib_tabctrl.o \
+ monolib_carbon_tabctrl.o \
monolib_utilscocoa.o
@COND_PLATFORM_MACOSX_1@__OSX_CARBON_COCOA_SRC_OBJECTS_0 = $(COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_0)
COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_17 = \
- monolib_accel.o \
+ monolib_osx_accel.o \
monolib_artmac.o \
monolib_bmpbuttn_osx.o \
- monolib_brush.o \
+ monolib_osx_brush.o \
monolib_button_osx.o \
monolib_checkbox_osx.o \
monolib_checklst_osx.o \
monolib_choice_osx.o \
monolib_dialog_osx.o \
- monolib_fontutil.o \
+ monolib_osx_fontutil.o \
monolib_gauge_osx.o \
- monolib_imaglist.o \
+ monolib_osx_imaglist.o \
monolib_listbox_osx.o \
monolib_menu_osx.o \
monolib_menuitem_osx.o \
- monolib_minifram.o \
+ monolib_osx_minifram.o \
monolib_nonownedwnd_osx.o \
monolib_notebook_osx.o \
- monolib_palette.o \
- monolib_pen.o \
+ monolib_osx_palette.o \
+ monolib_osx_pen.o \
monolib_radiobox_osx.o \
monolib_radiobut_osx.o \
monolib_scrolbar_osx.o \
@@ -12074,94 +12161,95 @@ COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_17 = \
monolib_toplevel_osx.o \
monolib_utils_osx.o \
monolib_window_osx.o \
- monolib_bitmap.o \
- monolib_colour.o \
- monolib_dcmemory.o \
- monolib_display.o \
- monolib_fontenum.o \
+ monolib_core_bitmap.o \
+ monolib_core_colour.o \
+ monolib_core_dcmemory.o \
+ monolib_core_display.o \
+ monolib_core_fontenum.o \
monolib_hid.o \
monolib_printmac.o \
- monolib_timer.o \
+ monolib_core_timer.o \
monolib_utilsexc_cf.o
@COND_PLATFORM_MACOSX_1@__OSX_LOWLEVEL_SRC_OBJECTS_17 = $(COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_17)
COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \
monolib_taskbarcmn.o \
- monolib_joystick.o \
- monolib_sound.o \
+ monolib_unix_joystick.o \
+ monolib_unix_sound.o \
monolib_taskbarx11.o
@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS_0)
COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \
- monolib_taskbar.o \
+ monolib_src_cocoa_taskbar.o \
monolib_taskbarcmn.o \
monolib_animateg.o \
monolib_hidjoystick.o
@COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_0)
COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS_0 = \
monolib_taskbarcmn.o \
- monolib_joystick.o \
- monolib_sound.o \
+ monolib_unix_joystick.o \
+ monolib_unix_sound.o \
monolib_taskbarx11.o \
monolib_animateg.o \
- monolib_eggtrayicon.o \
- monolib_taskbar.o
+ monolib_gtk1_eggtrayicon.o \
+ monolib_gtk1_taskbar.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS_0)
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \
monolib_taskbarcmn.o \
- monolib_joystick.o \
- monolib_sound.o \
+ monolib_unix_joystick.o \
+ monolib_unix_sound.o \
monolib_taskbarx11.o \
- monolib_taskbar.o \
- monolib_eggtrayicon.o \
- monolib_notifmsg.o
+ monolib_gtk_taskbar.o \
+ monolib_gtk_eggtrayicon.o \
+ monolib_hildon_notifmsg.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_0)
COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \
monolib_taskbarcmn.o \
- monolib_joystick.o \
- monolib_sound.o \
+ monolib_unix_joystick.o \
+ monolib_unix_sound.o \
monolib_taskbarx11.o \
monolib_animateg.o
@COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_0)
COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \
monolib_taskbarcmn.o \
monolib_animateg.o \
- monolib_aboutdlg.o \
- monolib_notifmsg.o \
- monolib_sound.o \
- monolib_taskbar.o \
- monolib_joystick.o
+ monolib_msw_aboutdlg.o \
+ monolib_msw_notifmsg.o \
+ monolib_msw_sound.o \
+ monolib_msw_taskbar.o \
+ monolib_msw_joystick.o
@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_0)
COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \
monolib_taskbarcmn.o \
monolib_animateg.o \
- monolib_aboutdlg.o \
- monolib_drawer.o \
- monolib_dataview.o \
+ monolib_carbon_aboutdlg.o \
+ monolib_carbon_drawer.o \
+ monolib_carbon_dataview.o \
monolib_databrow.o \
- monolib_sound.o \
- monolib_taskbar.o \
+ monolib_carbon_sound.o \
+ monolib_carbon_taskbar.o \
monolib_hidjoystick.o
@COND_TOOLKIT_OSX_CARBON@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS_0)
COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \
monolib_taskbarcmn.o \
monolib_animateg.o \
- monolib_aboutdlg.o \
- monolib_taskbar.o \
+ monolib_cocoa_aboutdlg.o \
+ monolib_osx_cocoa_taskbar.o \
monolib_hidjoystick.o
@COND_TOOLKIT_OSX_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_0)
@COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = \
-@COND_TOOLKIT_PM@ monolib_animateg.o monolib_joystick.o monolib_sound.o
+@COND_TOOLKIT_PM@ monolib_animateg.o monolib_os2_joystick.o \
+@COND_TOOLKIT_PM@ monolib_os2_sound.o
COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \
monolib_taskbarcmn.o \
monolib_animateg.o \
- monolib_aboutdlg.o \
- monolib_notifmsg.o \
- monolib_sound.o \
- monolib_taskbar.o
+ monolib_msw_aboutdlg.o \
+ monolib_msw_notifmsg.o \
+ monolib_msw_sound.o \
+ monolib_msw_taskbar.o
@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_0)
COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \
monolib_taskbarcmn.o \
- monolib_joystick.o \
- monolib_sound.o \
+ monolib_unix_joystick.o \
+ monolib_unix_sound.o \
monolib_taskbarx11.o
@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_0)
@COND_PLATFORM_MACOSX_1@__PLATFORM_SRC_OBJECTS_8 = coredll_apptraits.o
@@ -12169,55 +12257,54 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \
COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_8 = \
coredll_colordlgosx.o \
coredll_fontdlgosx.o \
- coredll_clipbrd.o \
- coredll_cursor.o \
- coredll_fontdlg.o \
- coredll_gdiobj.o \
- coredll_icon.o \
- coredll_app.o \
- coredll_combobox.o \
- coredll_control.o \
- coredll_dataobj.o \
- coredll_dcclient.o \
- coredll_dcprint.o \
- coredll_dcscreen.o \
- coredll_glgrab.o \
- coredll_graphics.o \
- coredll_dnd.o \
- coredll_font.o \
- coredll_frame.o \
- coredll_mdi.o \
- coredll_metafile.o \
- coredll_overlay.o \
- coredll_popupwin.o \
- coredll_printdlg.o \
- coredll_renderer.o \
- coredll_settings.o \
+ coredll_carbon_clipbrd.o \
+ coredll_carbon_cursor.o \
+ coredll_carbon_fontdlg.o \
+ coredll_carbon_gdiobj.o \
+ coredll_carbon_icon.o \
+ coredll_carbon_app.o \
+ coredll_carbon_combobox.o \
+ coredll_carbon_control.o \
+ coredll_carbon_dataobj.o \
+ coredll_carbon_dcclient.o \
+ coredll_carbon_dcprint.o \
+ coredll_carbon_dcscreen.o \
+ coredll_carbon_graphics.o \
+ coredll_carbon_dnd.o \
+ coredll_carbon_font.o \
+ coredll_carbon_frame.o \
+ coredll_carbon_mdi.o \
+ coredll_carbon_metafile.o \
+ coredll_carbon_overlay.o \
+ coredll_carbon_popupwin.o \
+ coredll_carbon_printdlg.o \
+ coredll_carbon_renderer.o \
+ coredll_carbon_settings.o \
coredll_statbrma.o \
- coredll_tabctrl.o \
+ coredll_carbon_tabctrl.o \
coredll_utilscocoa.o
@COND_PLATFORM_MACOSX_1@__OSX_CARBON_COCOA_SRC_OBJECTS_8 = $(COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_8)
COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_1_1 = \
- coredll_accel.o \
+ coredll_osx_accel.o \
coredll_artmac.o \
coredll_bmpbuttn_osx.o \
- coredll_brush.o \
+ coredll_osx_brush.o \
coredll_button_osx.o \
coredll_checkbox_osx.o \
coredll_checklst_osx.o \
coredll_choice_osx.o \
coredll_dialog_osx.o \
- coredll_fontutil.o \
+ coredll_osx_fontutil.o \
coredll_gauge_osx.o \
- coredll_imaglist.o \
+ coredll_osx_imaglist.o \
coredll_listbox_osx.o \
coredll_menu_osx.o \
coredll_menuitem_osx.o \
- coredll_minifram.o \
+ coredll_osx_minifram.o \
coredll_nonownedwnd_osx.o \
coredll_notebook_osx.o \
- coredll_palette.o \
- coredll_pen.o \
+ coredll_osx_palette.o \
+ coredll_osx_pen.o \
coredll_radiobox_osx.o \
coredll_radiobut_osx.o \
coredll_scrolbar_osx.o \
@@ -12235,14 +12322,14 @@ COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_1_1 = \
coredll_toplevel_osx.o \
coredll_utils_osx.o \
coredll_window_osx.o \
- coredll_bitmap.o \
- coredll_colour.o \
- coredll_dcmemory.o \
- coredll_display.o \
- coredll_fontenum.o \
+ coredll_core_bitmap.o \
+ coredll_core_colour.o \
+ coredll_core_dcmemory.o \
+ coredll_core_display.o \
+ coredll_core_fontenum.o \
coredll_hid.o \
coredll_printmac.o \
- coredll_timer.o \
+ coredll_core_timer.o \
coredll_utilsexc_cf.o
@COND_PLATFORM_MACOSX_1@__OSX_LOWLEVEL_SRC_OBJECTS_1_1 = $(COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_1_1)
@COND_PLATFORM_MACOSX_1@__PLATFORM_SRC_OBJECTS_9 = corelib_apptraits.o
@@ -12250,55 +12337,54 @@ COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_1_1 = \
COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_9 = \
corelib_colordlgosx.o \
corelib_fontdlgosx.o \
- corelib_clipbrd.o \
- corelib_cursor.o \
- corelib_fontdlg.o \
- corelib_gdiobj.o \
- corelib_icon.o \
- corelib_app.o \
- corelib_combobox.o \
- corelib_control.o \
- corelib_dataobj.o \
- corelib_dcclient.o \
- corelib_dcprint.o \
- corelib_dcscreen.o \
- corelib_glgrab.o \
- corelib_graphics.o \
- corelib_dnd.o \
- corelib_font.o \
- corelib_frame.o \
- corelib_mdi.o \
- corelib_metafile.o \
- corelib_overlay.o \
- corelib_popupwin.o \
- corelib_printdlg.o \
- corelib_renderer.o \
- corelib_settings.o \
+ corelib_carbon_clipbrd.o \
+ corelib_carbon_cursor.o \
+ corelib_carbon_fontdlg.o \
+ corelib_carbon_gdiobj.o \
+ corelib_carbon_icon.o \
+ corelib_carbon_app.o \
+ corelib_carbon_combobox.o \
+ corelib_carbon_control.o \
+ corelib_carbon_dataobj.o \
+ corelib_carbon_dcclient.o \
+ corelib_carbon_dcprint.o \
+ corelib_carbon_dcscreen.o \
+ corelib_carbon_graphics.o \
+ corelib_carbon_dnd.o \
+ corelib_carbon_font.o \
+ corelib_carbon_frame.o \
+ corelib_carbon_mdi.o \
+ corelib_carbon_metafile.o \
+ corelib_carbon_overlay.o \
+ corelib_carbon_popupwin.o \
+ corelib_carbon_printdlg.o \
+ corelib_carbon_renderer.o \
+ corelib_carbon_settings.o \
corelib_statbrma.o \
- corelib_tabctrl.o \
+ corelib_carbon_tabctrl.o \
corelib_utilscocoa.o
@COND_PLATFORM_MACOSX_1@__OSX_CARBON_COCOA_SRC_OBJECTS_9 = $(COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_9)
COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_1_4 = \
- corelib_accel.o \
+ corelib_osx_accel.o \
corelib_artmac.o \
corelib_bmpbuttn_osx.o \
- corelib_brush.o \
+ corelib_osx_brush.o \
corelib_button_osx.o \
corelib_checkbox_osx.o \
corelib_checklst_osx.o \
corelib_choice_osx.o \
corelib_dialog_osx.o \
- corelib_fontutil.o \
+ corelib_osx_fontutil.o \
corelib_gauge_osx.o \
- corelib_imaglist.o \
+ corelib_osx_imaglist.o \
corelib_listbox_osx.o \
corelib_menu_osx.o \
corelib_menuitem_osx.o \
- corelib_minifram.o \
+ corelib_osx_minifram.o \
corelib_nonownedwnd_osx.o \
corelib_notebook_osx.o \
- corelib_palette.o \
- corelib_pen.o \
+ corelib_osx_palette.o \
+ corelib_osx_pen.o \
corelib_radiobox_osx.o \
corelib_radiobut_osx.o \
corelib_scrolbar_osx.o \
@@ -12316,164 +12402,178 @@ COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_1_4 = \
corelib_toplevel_osx.o \
corelib_utils_osx.o \
corelib_window_osx.o \
- corelib_bitmap.o \
- corelib_colour.o \
- corelib_dcmemory.o \
- corelib_display.o \
- corelib_fontenum.o \
+ corelib_core_bitmap.o \
+ corelib_core_colour.o \
+ corelib_core_dcmemory.o \
+ corelib_core_display.o \
+ corelib_core_fontenum.o \
corelib_hid.o \
corelib_printmac.o \
- corelib_timer.o \
+ corelib_core_timer.o \
corelib_utilsexc_cf.o
@COND_PLATFORM_MACOSX_1@__OSX_LOWLEVEL_SRC_OBJECTS_1_4 = $(COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_1_4)
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@__ADVANCED_PLATFORM_SRC_OBJECTS_8 \
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@ = advdll_taskbarcmn.o advdll_joystick.o \
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@ advdll_sound.o advdll_taskbarx11.o
+COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
+ advdll_taskbarcmn.o \
+ advdll_unix_joystick.o \
+ advdll_unix_sound.o \
+ advdll_taskbarx11.o
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS_8)
COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
- advdll_taskbar.o \
+ advdll_src_cocoa_taskbar.o \
advdll_taskbarcmn.o \
advdll_animateg.o \
advdll_hidjoystick.o
@COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_8)
COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
advdll_taskbarcmn.o \
- advdll_joystick.o \
- advdll_sound.o \
+ advdll_unix_joystick.o \
+ advdll_unix_sound.o \
advdll_taskbarx11.o \
advdll_animateg.o \
- advdll_eggtrayicon.o \
- advdll_taskbar.o
+ advdll_gtk1_eggtrayicon.o \
+ advdll_gtk1_taskbar.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS_8)
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
advdll_taskbarcmn.o \
- advdll_joystick.o \
- advdll_sound.o \
+ advdll_unix_joystick.o \
+ advdll_unix_sound.o \
advdll_taskbarx11.o \
- advdll_taskbar.o \
- advdll_eggtrayicon.o \
- advdll_notifmsg.o
+ advdll_gtk_taskbar.o \
+ advdll_gtk_eggtrayicon.o \
+ advdll_hildon_notifmsg.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_8)
COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
advdll_taskbarcmn.o \
- advdll_joystick.o \
- advdll_sound.o \
+ advdll_unix_joystick.o \
+ advdll_unix_sound.o \
advdll_taskbarx11.o \
advdll_animateg.o
@COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_8)
COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
advdll_taskbarcmn.o \
advdll_animateg.o \
- advdll_aboutdlg.o \
- advdll_notifmsg.o \
- advdll_sound.o \
- advdll_taskbar.o \
- advdll_joystick.o
+ advdll_msw_aboutdlg.o \
+ advdll_msw_notifmsg.o \
+ advdll_msw_sound.o \
+ advdll_msw_taskbar.o \
+ advdll_msw_joystick.o
@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_8)
COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
advdll_taskbarcmn.o \
advdll_animateg.o \
- advdll_aboutdlg.o \
+ advdll_carbon_aboutdlg.o \
advdll_drawer.o \
- advdll_dataview.o \
+ advdll_carbon_dataview.o \
advdll_databrow.o \
- advdll_sound.o \
- advdll_taskbar.o \
+ advdll_carbon_sound.o \
+ advdll_carbon_taskbar.o \
advdll_hidjoystick.o
@COND_TOOLKIT_OSX_CARBON@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS_8)
COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
advdll_taskbarcmn.o \
advdll_animateg.o \
- advdll_aboutdlg.o \
- advdll_taskbar.o \
+ advdll_cocoa_aboutdlg.o \
+ advdll_osx_cocoa_taskbar.o \
advdll_hidjoystick.o
@COND_TOOLKIT_OSX_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_8)
@COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
-@COND_TOOLKIT_PM@ advdll_animateg.o advdll_joystick.o advdll_sound.o
+@COND_TOOLKIT_PM@ advdll_animateg.o advdll_os2_joystick.o \
+@COND_TOOLKIT_PM@ advdll_os2_sound.o
COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
advdll_taskbarcmn.o \
advdll_animateg.o \
- advdll_aboutdlg.o \
- advdll_notifmsg.o \
- advdll_sound.o \
- advdll_taskbar.o
+ advdll_msw_aboutdlg.o \
+ advdll_msw_notifmsg.o \
+ advdll_msw_sound.o \
+ advdll_msw_taskbar.o
@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_8)
-@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
-@COND_TOOLKIT_X11@ advdll_taskbarcmn.o advdll_joystick.o advdll_sound.o \
-@COND_TOOLKIT_X11@ advdll_taskbarx11.o
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@__ADVANCED_PLATFORM_SRC_OBJECTS_9 \
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@ = advlib_taskbarcmn.o advlib_joystick.o \
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@ advlib_sound.o advlib_taskbarx11.o
+COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
+ advdll_taskbarcmn.o \
+ advdll_unix_joystick.o \
+ advdll_unix_sound.o \
+ advdll_taskbarx11.o
+@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_8)
+COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
+ advlib_taskbarcmn.o \
+ advlib_unix_joystick.o \
+ advlib_unix_sound.o \
+ advlib_taskbarx11.o
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS_9)
COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
- advlib_taskbar.o \
+ advlib_src_cocoa_taskbar.o \
advlib_taskbarcmn.o \
advlib_animateg.o \
advlib_hidjoystick.o
@COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_9)
COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
advlib_taskbarcmn.o \
- advlib_joystick.o \
- advlib_sound.o \
+ advlib_unix_joystick.o \
+ advlib_unix_sound.o \
advlib_taskbarx11.o \
advlib_animateg.o \
- advlib_eggtrayicon.o \
- advlib_taskbar.o
+ advlib_gtk1_eggtrayicon.o \
+ advlib_gtk1_taskbar.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS_9)
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
advlib_taskbarcmn.o \
- advlib_joystick.o \
- advlib_sound.o \
+ advlib_unix_joystick.o \
+ advlib_unix_sound.o \
advlib_taskbarx11.o \
- advlib_taskbar.o \
- advlib_eggtrayicon.o \
- advlib_notifmsg.o
+ advlib_gtk_taskbar.o \
+ advlib_gtk_eggtrayicon.o \
+ advlib_hildon_notifmsg.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_9)
COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
advlib_taskbarcmn.o \
- advlib_joystick.o \
- advlib_sound.o \
+ advlib_unix_joystick.o \
+ advlib_unix_sound.o \
advlib_taskbarx11.o \
advlib_animateg.o
@COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_9)
COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
advlib_taskbarcmn.o \
advlib_animateg.o \
- advlib_aboutdlg.o \
- advlib_notifmsg.o \
- advlib_sound.o \
- advlib_taskbar.o \
- advlib_joystick.o
+ advlib_msw_aboutdlg.o \
+ advlib_msw_notifmsg.o \
+ advlib_msw_sound.o \
+ advlib_msw_taskbar.o \
+ advlib_msw_joystick.o
@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_9)
COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
advlib_taskbarcmn.o \
advlib_animateg.o \
- advlib_aboutdlg.o \
+ advlib_carbon_aboutdlg.o \
advlib_drawer.o \
- advlib_dataview.o \
+ advlib_carbon_dataview.o \
advlib_databrow.o \
- advlib_sound.o \
- advlib_taskbar.o \
+ advlib_carbon_sound.o \
+ advlib_carbon_taskbar.o \
advlib_hidjoystick.o
@COND_TOOLKIT_OSX_CARBON@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS_9)
COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
advlib_taskbarcmn.o \
advlib_animateg.o \
- advlib_aboutdlg.o \
- advlib_taskbar.o \
+ advlib_cocoa_aboutdlg.o \
+ advlib_osx_cocoa_taskbar.o \
advlib_hidjoystick.o
@COND_TOOLKIT_OSX_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_9)
@COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
-@COND_TOOLKIT_PM@ advlib_animateg.o advlib_joystick.o advlib_sound.o
+@COND_TOOLKIT_PM@ advlib_animateg.o advlib_os2_joystick.o \
+@COND_TOOLKIT_PM@ advlib_os2_sound.o
COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
advlib_taskbarcmn.o \
advlib_animateg.o \
- advlib_aboutdlg.o \
- advlib_notifmsg.o \
- advlib_sound.o \
- advlib_taskbar.o
+ advlib_msw_aboutdlg.o \
+ advlib_msw_notifmsg.o \
+ advlib_msw_sound.o \
+ advlib_msw_taskbar.o
@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_9)
-@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
-@COND_TOOLKIT_X11@ advlib_taskbarcmn.o advlib_joystick.o advlib_sound.o \
-@COND_TOOLKIT_X11@ advlib_taskbarx11.o
+COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
+ advlib_taskbarcmn.o \
+ advlib_unix_joystick.o \
+ advlib_unix_sound.o \
+ advlib_taskbarx11.o
+@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_9)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__htmldll_library_link_DEP \
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ = $(__htmldll___depname)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__htmldll_library_link_LIBR \
@@ -12498,59 +12598,59 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0 \
@COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX)
@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_BUILD_p_58 \
-@COND_WXUSE_LIBTIFF_BUILTIN@ = --include-dir \
-@COND_WXUSE_LIBTIFF_BUILTIN@ $(wx_top_builddir)/src/tiff/libtiff
-@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_58 = \
-@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff/libtiff
-@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_58 = \
-@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg
-@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_57 = \
-@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png
-@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_59 = \
-@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib
-@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_57 = \
-@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex
-@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p_57 = \
-@COND_WXUSE_EXPAT_BUILTIN@ --include-dir $(top_srcdir)/src/expat/lib
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_wxUSE_LIBTIFF_builtin@__INC_TIFF_BUILD_p_58 \
+@COND_wxUSE_LIBTIFF_builtin@ = --include-dir \
+@COND_wxUSE_LIBTIFF_builtin@ $(wx_top_builddir)/src/tiff/libtiff
+@COND_wxUSE_LIBTIFF_builtin@__INC_TIFF_p_58 = \
+@COND_wxUSE_LIBTIFF_builtin@ --include-dir $(top_srcdir)/src/tiff/libtiff
+@COND_wxUSE_LIBJPEG_builtin@__INC_JPEG_p_58 = \
+@COND_wxUSE_LIBJPEG_builtin@ --include-dir $(top_srcdir)/src/jpeg
+@COND_wxUSE_LIBPNG_builtin@__INC_PNG_p_57 = \
+@COND_wxUSE_LIBPNG_builtin@ --include-dir $(top_srcdir)/src/png
+@COND_wxUSE_ZLIB_builtin@__INC_ZLIB_p_59 = \
+@COND_wxUSE_ZLIB_builtin@ --include-dir $(top_srcdir)/src/zlib
+@COND_wxUSE_REGEX_builtin@__INC_REGEX_p_57 = \
+@COND_wxUSE_REGEX_builtin@ --include-dir $(top_srcdir)/src/regex
+@COND_wxUSE_EXPAT_builtin@__INC_EXPAT_p_57 = \
+@COND_wxUSE_EXPAT_builtin@ --include-dir $(top_srcdir)/src/expat/lib
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
-@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_BUILD_p \
-@COND_WXUSE_LIBTIFF_BUILTIN@ = -I$(wx_top_builddir)/src/tiff/libtiff
-@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff/libtiff
-@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg
-@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png
-@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib
-@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex
-@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p = -I$(top_srcdir)/src/expat/lib
+@COND_wxUSE_LIBTIFF_builtin@__INC_TIFF_BUILD_p \
+@COND_wxUSE_LIBTIFF_builtin@ = -I$(wx_top_builddir)/src/tiff/libtiff
+@COND_wxUSE_LIBTIFF_builtin@__INC_TIFF_p = -I$(top_srcdir)/src/tiff/libtiff
+@COND_wxUSE_LIBJPEG_builtin@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg
+@COND_wxUSE_LIBPNG_builtin@__INC_PNG_p = -I$(top_srcdir)/src/png
+@COND_wxUSE_ZLIB_builtin@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib
+@COND_wxUSE_REGEX_builtin@__INC_REGEX_p = -I$(top_srcdir)/src/regex
+@COND_wxUSE_EXPAT_builtin@__INC_EXPAT_p = -I$(top_srcdir)/src/expat/lib
### Targets: ###
all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__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) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
-install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
+install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
$(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 $(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)
$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
for f in setup.h $(RCDEFS_H); do \
if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \
@@ -12583,7 +12683,7 @@ install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__in
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_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)
+ (cd $(DESTDIR)$(datadir)/bakefile/presets ; rm -f wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl)
for f in setup.h $(RCDEFS_H); do \
rm -f $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/$$f; \
done
@@ -12687,84 +12787,84 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-(cd samples && $(MAKE) distclean)
-@COND_WXUSE_REGEX_BUILTIN@$(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(WXREGEX_OBJECTS)
-@COND_WXUSE_REGEX_BUILTIN@ rm -f $@
-@COND_WXUSE_REGEX_BUILTIN@ $(AR) $(AROPTIONS) $@ $(WXREGEX_OBJECTS)
-@COND_WXUSE_REGEX_BUILTIN@ $(RANLIB) $@
+@COND_wxUSE_REGEX_builtin@$(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(WXREGEX_OBJECTS)
+@COND_wxUSE_REGEX_builtin@ rm -f $@
+@COND_wxUSE_REGEX_builtin@ $(AR) $(AROPTIONS) $@ $(WXREGEX_OBJECTS)
+@COND_wxUSE_REGEX_builtin@ $(RANLIB) $@
-@COND_SHARED_0_WXUSE_REGEX_BUILTIN@install_wxregex:
-@COND_SHARED_0_WXUSE_REGEX_BUILTIN@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0_WXUSE_REGEX_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
+@COND_SHARED_0_wxUSE_REGEX_builtin@install_wxregex: $(__wxregex___depname)
+@COND_SHARED_0_wxUSE_REGEX_builtin@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_0_wxUSE_REGEX_builtin@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
-@COND_SHARED_0_WXUSE_REGEX_BUILTIN@uninstall_wxregex:
-@COND_SHARED_0_WXUSE_REGEX_BUILTIN@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@COND_SHARED_0_wxUSE_REGEX_builtin@uninstall_wxregex:
+@COND_SHARED_0_wxUSE_REGEX_builtin@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_WXUSE_ZLIB_BUILTIN@$(LIBDIRNAME)/$(LIBPREFIX)wxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(WXZLIB_OBJECTS)
-@COND_WXUSE_ZLIB_BUILTIN@ rm -f $@
-@COND_WXUSE_ZLIB_BUILTIN@ $(AR) $(AROPTIONS) $@ $(WXZLIB_OBJECTS)
-@COND_WXUSE_ZLIB_BUILTIN@ $(RANLIB) $@
+@COND_wxUSE_ZLIB_builtin@$(LIBDIRNAME)/$(LIBPREFIX)wxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(WXZLIB_OBJECTS)
+@COND_wxUSE_ZLIB_builtin@ rm -f $@
+@COND_wxUSE_ZLIB_builtin@ $(AR) $(AROPTIONS) $@ $(WXZLIB_OBJECTS)
+@COND_wxUSE_ZLIB_builtin@ $(RANLIB) $@
-@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@install_wxzlib:
-@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
+@COND_SHARED_0_wxUSE_ZLIB_builtin@install_wxzlib: $(__wxzlib___depname)
+@COND_SHARED_0_wxUSE_ZLIB_builtin@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_0_wxUSE_ZLIB_builtin@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
-@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@uninstall_wxzlib:
-@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@COND_SHARED_0_wxUSE_ZLIB_builtin@uninstall_wxzlib:
+@COND_SHARED_0_wxUSE_ZLIB_builtin@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@$(LIBDIRNAME)/$(LIBPREFIX)wxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(WXPNG_OBJECTS)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ rm -f $@
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ $(AR) $(AROPTIONS) $@ $(WXPNG_OBJECTS)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ $(RANLIB) $@
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@$(LIBDIRNAME)/$(LIBPREFIX)wxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(WXPNG_OBJECTS)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ rm -f $@
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ $(AR) $(AROPTIONS) $@ $(WXPNG_OBJECTS)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ $(RANLIB) $@
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@install_wxpng:
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin@install_wxpng: $(__wxpng___depname)
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@uninstall_wxpng:
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin@uninstall_wxpng:
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@$(LIBDIRNAME)/$(LIBPREFIX)wxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(WXJPEG_OBJECTS)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ rm -f $@
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ $(AR) $(AROPTIONS) $@ $(WXJPEG_OBJECTS)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ $(RANLIB) $@
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@$(LIBDIRNAME)/$(LIBPREFIX)wxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(WXJPEG_OBJECTS)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ rm -f $@
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ $(AR) $(AROPTIONS) $@ $(WXJPEG_OBJECTS)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ $(RANLIB) $@
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@install_wxjpeg:
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin@install_wxjpeg: $(__wxjpeg___depname)
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@uninstall_wxjpeg:
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin@uninstall_wxjpeg:
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@$(LIBDIRNAME)/$(LIBPREFIX)wxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(WXTIFF_OBJECTS)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ rm -f $@
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ $(AR) $(AROPTIONS) $@ $(WXTIFF_OBJECTS)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ $(RANLIB) $@
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@$(LIBDIRNAME)/$(LIBPREFIX)wxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(WXTIFF_OBJECTS)
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ rm -f $@
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ $(AR) $(AROPTIONS) $@ $(WXTIFF_OBJECTS)
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ $(RANLIB) $@
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@install_wxtiff:
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin@install_wxtiff: $(__wxtiff___depname)
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@uninstall_wxtiff:
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin@uninstall_wxtiff:
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_WXUSE_EXPAT_BUILTIN@$(LIBDIRNAME)/$(LIBPREFIX)wxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(WXEXPAT_OBJECTS)
-@COND_WXUSE_EXPAT_BUILTIN@ rm -f $@
-@COND_WXUSE_EXPAT_BUILTIN@ $(AR) $(AROPTIONS) $@ $(WXEXPAT_OBJECTS)
-@COND_WXUSE_EXPAT_BUILTIN@ $(RANLIB) $@
+@COND_wxUSE_EXPAT_builtin@$(LIBDIRNAME)/$(LIBPREFIX)wxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(WXEXPAT_OBJECTS)
+@COND_wxUSE_EXPAT_builtin@ rm -f $@
+@COND_wxUSE_EXPAT_builtin@ $(AR) $(AROPTIONS) $@ $(WXEXPAT_OBJECTS)
+@COND_wxUSE_EXPAT_builtin@ $(RANLIB) $@
-@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@install_wxexpat:
-@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
+@COND_SHARED_0_wxUSE_EXPAT_builtin@install_wxexpat: $(__wxexpat___depname)
+@COND_SHARED_0_wxUSE_EXPAT_builtin@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_0_wxUSE_EXPAT_builtin@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
-@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@uninstall_wxexpat:
-@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@COND_SHARED_0_wxUSE_EXPAT_builtin@uninstall_wxexpat:
+@COND_SHARED_0_wxUSE_EXPAT_builtin@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
@COND_USE_STC_1@$(LIBDIRNAME)/$(LIBPREFIX)wxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(WXSCINTILLA_OBJECTS)
@COND_USE_STC_1@ rm -f $@
@COND_USE_STC_1@ $(AR) $(AROPTIONS) $@ $(WXSCINTILLA_OBJECTS)
@COND_USE_STC_1@ $(RANLIB) $@
-@COND_SHARED_0_USE_STC_1@install_wxscintilla:
+@COND_SHARED_0_USE_STC_1@install_wxscintilla: $(__wxscintilla___depname)
@COND_SHARED_0_USE_STC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_SHARED_0_USE_STC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
@@ -12772,11 +12872,11 @@ distclean: clean
@COND_SHARED_0_USE_STC_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
@COND_MONOLITHIC_1_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__monodll___win32rc) $(__wxscintilla_library_link_DEP)
-@COND_MONOLITHIC_1_SHARED_1@ $(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(__wxscintilla_library_link_LIBR) $(LDFLAGS) -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(WXMACVERSION_CMD) $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_XML) $(EXTRALIBS_HTML) $(EXTRALIBS_MEDIA) $(PLUGIN_ADV_EXTRALIBS) $(__wxscintilla_library_link_LIBR_1)
+@COND_MONOLITHIC_1_SHARED_1@ $(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(__wxscintilla_library_link_LIBR) -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_XML) $(EXTRALIBS_HTML) $(EXTRALIBS_MEDIA) $(PLUGIN_ADV_EXTRALIBS) $(__wxscintilla_library_link_LIBR_1) $(LIBS)
@COND_MONOLITHIC_1_SHARED_1@
@COND_MONOLITHIC_1_SHARED_1@ $(__monodll___so_symlinks_cmd)
-@COND_MONOLITHIC_1_SHARED_1@install_monodll:
+@COND_MONOLITHIC_1_SHARED_1@install_monodll: $(__monodll___depname)
@COND_MONOLITHIC_1_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_1_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_1_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
@@ -12787,30 +12887,30 @@ distclean: clean
@COND_MONOLITHIC_1_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
@COND_MONOLITHIC_1_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__monodll___so_symlinks_uninst_cmd))
-@COND_USE_PCH_1@.pch/wxprec_monodll/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_monodll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MONODLL_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_monodll/wx/wxprec.h.gch:
+@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_monodll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MONODLL_CXXFLAGS)
@COND_MONOLITHIC_1_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(MONOLIB_OBJECTS)
@COND_MONOLITHIC_1_SHARED_0@ rm -f $@
@COND_MONOLITHIC_1_SHARED_0@ $(AR) $(AROPTIONS) $@ $(MONOLIB_OBJECTS)
@COND_MONOLITHIC_1_SHARED_0@ $(RANLIB) $@
-@COND_MONOLITHIC_1_SHARED_0@install_monolib:
+@COND_MONOLITHIC_1_SHARED_0@install_monolib: $(__monolib___depname)
@COND_MONOLITHIC_1_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_1_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_1_SHARED_0@uninstall_monolib:
@COND_MONOLITHIC_1_SHARED_0@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_USE_PCH_1@.pch/wxprec_monolib/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_monolib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MONOLIB_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_monolib/wx/wxprec.h.gch:
+@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_monolib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MONOLIB_CXXFLAGS)
@COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__basedll___win32rc)
-@COND_MONOLITHIC_0_SHARED_1@ $(SHARED_LD_CXX) $@ $(BASEDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__basedll___macinstnamecmd) $(__basedll___importlib) $(__basedll___soname_flags) $(WXMACVERSION_CMD) $(LIBS) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+@COND_MONOLITHIC_0_SHARED_1@ $(SHARED_LD_CXX) $@ $(BASEDLL_OBJECTS) -L$(LIBDIRNAME) $(__basedll___macinstnamecmd) $(__basedll___importlib) $(__basedll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
@COND_MONOLITHIC_0_SHARED_1@
@COND_MONOLITHIC_0_SHARED_1@ $(__basedll___so_symlinks_cmd)
-@COND_MONOLITHIC_0_SHARED_1@install_basedll:
+@COND_MONOLITHIC_0_SHARED_1@install_basedll: $(__basedll___depname)
@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
@@ -12821,32 +12921,32 @@ distclean: clean
@COND_MONOLITHIC_0_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
@COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__basedll___so_symlinks_uninst_cmd))
-@COND_USE_PCH_1@.pch/wxprec_basedll/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_basedll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(BASEDLL_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_basedll/wx/wxprec.h.gch:
+@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_basedll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(BASEDLL_CXXFLAGS)
@COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(BASELIB_OBJECTS)
@COND_MONOLITHIC_0_SHARED_0@ rm -f $@
@COND_MONOLITHIC_0_SHARED_0@ $(AR) $(AROPTIONS) $@ $(BASELIB_OBJECTS)
@COND_MONOLITHIC_0_SHARED_0@ $(RANLIB) $@
-@COND_MONOLITHIC_0_SHARED_0@install_baselib:
+@COND_MONOLITHIC_0_SHARED_0@install_baselib: $(__baselib___depname)
@COND_MONOLITHIC_0_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_0@uninstall_baselib:
@COND_MONOLITHIC_0_SHARED_0@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_USE_PCH_1@.pch/wxprec_baselib/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_baselib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(BASELIB_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_baselib/wx/wxprec.h.gch:
+@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_baselib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(BASELIB_CXXFLAGS)
@COND_MONOLITHIC_0@wxbase: $(____wxbase_namedll_DEP) $(____wxbase_namelib_DEP)
@COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__netdll___win32rc) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1@ $(SHARED_LD_CXX) $@ $(NETDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__netdll___macinstnamecmd) $(__netdll___importlib) $(__netdll___soname_flags) $(WXMACVERSION_CMD) $(LIBS) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1@ $(SHARED_LD_CXX) $@ $(NETDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(__netdll___macinstnamecmd) $(__netdll___importlib) $(__netdll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(LIBS)
@COND_MONOLITHIC_0_SHARED_1@
@COND_MONOLITHIC_0_SHARED_1@ $(__netdll___so_symlinks_cmd)
-@COND_MONOLITHIC_0_SHARED_1@install_netdll:
+@COND_MONOLITHIC_0_SHARED_1@install_netdll: $(__netdll___depname)
@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
@@ -12857,32 +12957,32 @@ distclean: clean
@COND_MONOLITHIC_0_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
@COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__netdll___so_symlinks_uninst_cmd))
-@COND_USE_PCH_1@.pch/wxprec_netdll/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_netdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETDLL_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_netdll/wx/wxprec.h.gch:
+@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_netdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETDLL_CXXFLAGS)
@COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(NETLIB_OBJECTS)
@COND_MONOLITHIC_0_SHARED_0@ rm -f $@
@COND_MONOLITHIC_0_SHARED_0@ $(AR) $(AROPTIONS) $@ $(NETLIB_OBJECTS)
@COND_MONOLITHIC_0_SHARED_0@ $(RANLIB) $@
-@COND_MONOLITHIC_0_SHARED_0@install_netlib:
+@COND_MONOLITHIC_0_SHARED_0@install_netlib: $(__netlib___depname)
@COND_MONOLITHIC_0_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_0@uninstall_netlib:
@COND_MONOLITHIC_0_SHARED_0@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_USE_PCH_1@.pch/wxprec_netlib/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_netlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETLIB_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_netlib/wx/wxprec.h.gch:
+@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_netlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETLIB_CXXFLAGS)
@COND_MONOLITHIC_0@wxnet: $(____wxnet_namedll_DEP) $(____wxnet_namelib_DEP)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__coredll___win32rc) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(COREDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__coredll___macinstnamecmd) $(__coredll___importlib) $(__coredll___soname_flags) $(WXMACVERSION_CMD) $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(COREDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(__coredll___macinstnamecmd) $(__coredll___importlib) $(__coredll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(LIBS)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(__coredll___so_symlinks_cmd)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@install_coredll:
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@install_coredll: $(__coredll___depname)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
@@ -12893,32 +12993,32 @@ distclean: clean
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ; $(__coredll___so_symlinks_uninst_cmd))
-@COND_USE_PCH_1@.pch/wxprec_coredll/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_coredll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(COREDLL_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_coredll/wx/wxprec.h.gch:
+@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_coredll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(COREDLL_CXXFLAGS)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(CORELIB_OBJECTS)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ rm -f $@
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(AR) $(AROPTIONS) $@ $(CORELIB_OBJECTS)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(RANLIB) $@
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@install_corelib:
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@install_corelib: $(__corelib___depname)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@uninstall_corelib:
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_USE_PCH_1@.pch/wxprec_corelib/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_corelib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(CORELIB_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_corelib/wx/wxprec.h.gch:
+@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_corelib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(CORELIB_CXXFLAGS)
@COND_MONOLITHIC_0_USE_GUI_1@wxcore: $(____wxcore_namedll_DEP) $(____wxcore_namelib_DEP)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__advdll___win32rc) $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(ADVDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__advdll___macinstnamecmd) $(__advdll___importlib) $(__advdll___soname_flags) $(WXMACVERSION_CMD) $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(PLUGIN_ADV_EXTRALIBS)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(ADVDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(__advdll___macinstnamecmd) $(__advdll___importlib) $(__advdll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(PLUGIN_ADV_EXTRALIBS) $(LIBS)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(__advdll___so_symlinks_cmd)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@install_advdll:
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@install_advdll: $(__advdll___depname)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
@@ -12929,32 +13029,32 @@ distclean: clean
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ; $(__advdll___so_symlinks_uninst_cmd))
-@COND_USE_PCH_1@.pch/wxprec_advdll/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_advdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ADVDLL_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_advdll/wx/wxprec.h.gch:
+@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_advdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ADVDLL_CXXFLAGS)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(ADVLIB_OBJECTS)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ rm -f $@
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(AR) $(AROPTIONS) $@ $(ADVLIB_OBJECTS)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(RANLIB) $@
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@install_advlib:
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@install_advlib: $(__advlib___depname)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@uninstall_advlib:
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_USE_PCH_1@.pch/wxprec_advlib/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_advlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ADVLIB_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_advlib/wx/wxprec.h.gch:
+@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_advlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ADVLIB_CXXFLAGS)
@COND_MONOLITHIC_0_USE_GUI_1@wxadv: $(____wxadv_namedll_DEP) $(____wxadv_namelib_DEP)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__mediadll___win32rc) $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ $(SHARED_LD_CXX) $@ $(MEDIADLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__mediadll___macinstnamecmd) $(__mediadll___importlib) $(__mediadll___soname_flags) $(WXMACVERSION_CMD) $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_MEDIA)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ $(SHARED_LD_CXX) $@ $(MEDIADLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(__mediadll___macinstnamecmd) $(__mediadll___importlib) $(__mediadll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_MEDIA) $(LIBS)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ $(__mediadll___so_symlinks_cmd)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@install_mediadll:
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@install_mediadll: $(__mediadll___depname)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
@@ -12965,32 +13065,32 @@ distclean: clean
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ (cd $(DESTDIR)$(libdir) ; $(__mediadll___so_symlinks_uninst_cmd))
-@COND_USE_PCH_1@.pch/wxprec_mediadll/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_mediadll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MEDIADLL_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_mediadll/wx/wxprec.h.gch:
+@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_mediadll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MEDIADLL_CXXFLAGS)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(MEDIALIB_OBJECTS)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@ rm -f $@
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@ $(AR) $(AROPTIONS) $@ $(MEDIALIB_OBJECTS)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@ $(RANLIB) $@
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@install_medialib:
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@install_medialib: $(__medialib___depname)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@uninstall_medialib:
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_USE_PCH_1@.pch/wxprec_medialib/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_medialib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MEDIALIB_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_medialib/wx/wxprec.h.gch:
+@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_medialib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MEDIALIB_CXXFLAGS)
@COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1@wxmedia: $(____wxmedia_namedll_DEP) $(____wxmedia_namelib_DEP)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__htmldll___win32rc) $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ $(SHARED_LD_CXX) $@ $(HTMLDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__htmldll___macinstnamecmd) $(__htmldll___importlib) $(__htmldll___soname_flags) $(WXMACVERSION_CMD) $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_HTML)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ $(SHARED_LD_CXX) $@ $(HTMLDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(__htmldll___macinstnamecmd) $(__htmldll___importlib) $(__htmldll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_HTML) $(LIBS)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ $(__htmldll___so_symlinks_cmd)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@install_htmldll:
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@install_htmldll: $(__htmldll___depname)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
@@ -13001,32 +13101,32 @@ distclean: clean
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ (cd $(DESTDIR)$(libdir) ; $(__htmldll___so_symlinks_uninst_cmd))
-@COND_USE_PCH_1@.pch/wxprec_htmldll/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_htmldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(HTMLDLL_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_htmldll/wx/wxprec.h.gch:
+@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_htmldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(HTMLDLL_CXXFLAGS)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(HTMLLIB_OBJECTS)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@ rm -f $@
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@ $(AR) $(AROPTIONS) $@ $(HTMLLIB_OBJECTS)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@ $(RANLIB) $@
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@install_htmllib:
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@install_htmllib: $(__htmllib___depname)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@uninstall_htmllib:
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_USE_PCH_1@.pch/wxprec_htmllib/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_htmllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(HTMLLIB_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_htmllib/wx/wxprec.h.gch:
+@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_htmllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(HTMLLIB_CXXFLAGS)
@COND_MONOLITHIC_0_USE_HTML_1@wxhtml: $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__qadll___win32rc) $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ $(SHARED_LD_CXX) $@ $(QADLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__qadll___macinstnamecmd) $(__qadll___importlib) $(__qadll___soname_flags) $(WXMACVERSION_CMD) $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ $(SHARED_LD_CXX) $@ $(QADLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(__qadll___macinstnamecmd) $(__qadll___importlib) $(__qadll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX) $(LIBS)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ $(__qadll___so_symlinks_cmd)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@install_qadll:
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@install_qadll: $(__qadll___depname)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
@@ -13037,32 +13137,32 @@ distclean: clean
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ (cd $(DESTDIR)$(libdir) ; $(__qadll___so_symlinks_uninst_cmd))
-@COND_USE_PCH_1@.pch/wxprec_qadll/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_qadll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(QADLL_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_qadll/wx/wxprec.h.gch:
+@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_qadll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(QADLL_CXXFLAGS)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(QALIB_OBJECTS)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@ rm -f $@
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@ $(AR) $(AROPTIONS) $@ $(QALIB_OBJECTS)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@ $(RANLIB) $@
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@install_qalib:
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@install_qalib: $(__qalib___depname)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@uninstall_qalib:
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_USE_PCH_1@.pch/wxprec_qalib/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_qalib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(QALIB_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_qalib/wx/wxprec.h.gch:
+@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_qalib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(QALIB_CXXFLAGS)
@COND_MONOLITHIC_0_USE_QA_1@wxqa: $(____wxqa_namedll_DEP) $(____wxqa_namelib_DEP)
@COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__xmldll___win32rc) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1@ $(SHARED_LD_CXX) $@ $(XMLDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__xmldll___macinstnamecmd) $(__xmldll___importlib) $(__xmldll___soname_flags) $(WXMACVERSION_CMD) $(LIBS) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_XML)
+@COND_MONOLITHIC_0_SHARED_1@ $(SHARED_LD_CXX) $@ $(XMLDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(__xmldll___macinstnamecmd) $(__xmldll___importlib) $(__xmldll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_XML) $(LIBS)
@COND_MONOLITHIC_0_SHARED_1@
@COND_MONOLITHIC_0_SHARED_1@ $(__xmldll___so_symlinks_cmd)
-@COND_MONOLITHIC_0_SHARED_1@install_xmldll:
+@COND_MONOLITHIC_0_SHARED_1@install_xmldll: $(__xmldll___depname)
@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
@@ -13073,32 +13173,32 @@ distclean: clean
@COND_MONOLITHIC_0_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
@COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__xmldll___so_symlinks_uninst_cmd))
-@COND_USE_PCH_1@.pch/wxprec_xmldll/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_xmldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XMLDLL_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_xmldll/wx/wxprec.h.gch:
+@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_xmldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XMLDLL_CXXFLAGS)
@COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(XMLLIB_OBJECTS)
@COND_MONOLITHIC_0_SHARED_0@ rm -f $@
@COND_MONOLITHIC_0_SHARED_0@ $(AR) $(AROPTIONS) $@ $(XMLLIB_OBJECTS)
@COND_MONOLITHIC_0_SHARED_0@ $(RANLIB) $@
-@COND_MONOLITHIC_0_SHARED_0@install_xmllib:
+@COND_MONOLITHIC_0_SHARED_0@install_xmllib: $(__xmllib___depname)
@COND_MONOLITHIC_0_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_0@uninstall_xmllib:
@COND_MONOLITHIC_0_SHARED_0@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_USE_PCH_1@.pch/wxprec_xmllib/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_xmllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XMLLIB_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_xmllib/wx/wxprec.h.gch:
+@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_xmllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XMLLIB_CXXFLAGS)
@COND_MONOLITHIC_0@wxxml: $(____wxxml_namedll_DEP) $(____wxxml_namelib_DEP)
@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__xrcdll___win32rc) $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(SHARED_LD_CXX) $@ $(XRCDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(__htmldll_library_link_LIBR) $(LDFLAGS) -L$(LIBDIRNAME) $(__xrcdll___macinstnamecmd) $(__xrcdll___importlib) $(__xrcdll___soname_flags) $(WXMACVERSION_CMD) $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__htmldll_library_link_LIBR_0) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(SHARED_LD_CXX) $@ $(XRCDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(__htmldll_library_link_LIBR) -L$(LIBDIRNAME) $(__xrcdll___macinstnamecmd) $(__xrcdll___importlib) $(__xrcdll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__htmldll_library_link_LIBR_0) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(LIBS)
@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@
@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(__xrcdll___so_symlinks_cmd)
-@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@install_xrcdll:
+@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@install_xrcdll: $(__xrcdll___depname)
@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
@@ -13109,32 +13209,32 @@ distclean: clean
@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ (cd $(DESTDIR)$(libdir) ; $(__xrcdll___so_symlinks_uninst_cmd))
-@COND_USE_PCH_1@.pch/wxprec_xrcdll/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_xrcdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XRCDLL_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_xrcdll/wx/wxprec.h.gch:
+@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_xrcdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XRCDLL_CXXFLAGS)
@COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(XRCLIB_OBJECTS)
@COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@ rm -f $@
@COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@ $(AR) $(AROPTIONS) $@ $(XRCLIB_OBJECTS)
@COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@ $(RANLIB) $@
-@COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@install_xrclib:
+@COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@install_xrclib: $(__xrclib___depname)
@COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@uninstall_xrclib:
@COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_USE_PCH_1@.pch/wxprec_xrclib/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_xrclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XRCLIB_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_xrclib/wx/wxprec.h.gch:
+@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_xrclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XRCLIB_CXXFLAGS)
@COND_MONOLITHIC_0_USE_XRC_1@wxxrc: $(____wxxrc_namedll_DEP) $(____wxxrc_namelib_DEP)
@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__auidll___win32rc) $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(SHARED_LD_CXX) $@ $(AUIDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__auidll___macinstnamecmd) $(__auidll___importlib) $(__auidll___soname_flags) $(WXMACVERSION_CMD) $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(SHARED_LD_CXX) $@ $(AUIDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(__auidll___macinstnamecmd) $(__auidll___importlib) $(__auidll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(LIBS)
@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@
@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(__auidll___so_symlinks_cmd)
-@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@install_auidll:
+@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@install_auidll: $(__auidll___depname)
@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
@@ -13145,32 +13245,32 @@ distclean: clean
@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ (cd $(DESTDIR)$(libdir) ; $(__auidll___so_symlinks_uninst_cmd))
-@COND_USE_PCH_1@.pch/wxprec_auidll/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_auidll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(AUIDLL_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_auidll/wx/wxprec.h.gch:
+@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_auidll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(AUIDLL_CXXFLAGS)
@COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(AUILIB_OBJECTS)
@COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@ rm -f $@
@COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@ $(AR) $(AROPTIONS) $@ $(AUILIB_OBJECTS)
@COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@ $(RANLIB) $@
-@COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@install_auilib:
+@COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@install_auilib: $(__auilib___depname)
@COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@uninstall_auilib:
@COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_USE_PCH_1@.pch/wxprec_auilib/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_auilib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(AUILIB_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_auilib/wx/wxprec.h.gch:
+@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_auilib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(AUILIB_CXXFLAGS)
@COND_MONOLITHIC_0_USE_AUI_1@wxaui: $(____wxaui_namedll_DEP) $(____wxaui_namelib_DEP)
@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(PROPGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__propgriddll___win32rc) $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@ $(SHARED_LD_CXX) $@ $(PROPGRIDDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__propgriddll___macinstnamecmd) $(__propgriddll___importlib) $(__propgriddll___soname_flags) $(WXMACVERSION_CMD) $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@ $(SHARED_LD_CXX) $@ $(PROPGRIDDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(__propgriddll___macinstnamecmd) $(__propgriddll___importlib) $(__propgriddll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(LIBS)
@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@
@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@ $(__propgriddll___so_symlinks_cmd)
-@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@install_propgriddll:
+@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@install_propgriddll: $(__propgriddll___depname)
@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
@@ -13181,32 +13281,32 @@ distclean: clean
@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@ (cd $(DESTDIR)$(libdir) ; $(__propgriddll___so_symlinks_uninst_cmd))
-@COND_USE_PCH_1@.pch/wxprec_propgriddll/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_propgriddll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(PROPGRIDDLL_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_propgriddll/wx/wxprec.h.gch:
+@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_propgriddll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(PROPGRIDDLL_CXXFLAGS)
@COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(PROPGRIDLIB_OBJECTS)
@COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1@ rm -f $@
@COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1@ $(AR) $(AROPTIONS) $@ $(PROPGRIDLIB_OBJECTS)
@COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1@ $(RANLIB) $@
-@COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1@install_propgridlib:
+@COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1@install_propgridlib: $(__propgridlib___depname)
@COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1@uninstall_propgridlib:
@COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_USE_PCH_1@.pch/wxprec_propgridlib/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_propgridlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(PROPGRIDLIB_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_propgridlib/wx/wxprec.h.gch:
+@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_propgridlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(PROPGRIDLIB_CXXFLAGS)
@COND_MONOLITHIC_0_USE_PROPGRID_1@wxpropgrid: $(____wxpropgrid_namedll_DEP) $(____wxpropgrid_namelib_DEP)
@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__richtextdll___win32rc) $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ $(SHARED_LD_CXX) $@ $(RICHTEXTDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(__htmldll_library_link_LIBR) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__richtextdll___macinstnamecmd) $(__richtextdll___importlib) $(__richtextdll___soname_flags) $(WXMACVERSION_CMD) $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX) $(__htmldll_library_link_LIBR_0) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ $(SHARED_LD_CXX) $@ $(RICHTEXTDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(__htmldll_library_link_LIBR) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(__richtextdll___macinstnamecmd) $(__richtextdll___importlib) $(__richtextdll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX) $(__htmldll_library_link_LIBR_0) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(LIBS)
@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@
@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ $(__richtextdll___so_symlinks_cmd)
-@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@install_richtextdll:
+@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@install_richtextdll: $(__richtextdll___depname)
@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
@@ -13217,32 +13317,32 @@ distclean: clean
@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ (cd $(DESTDIR)$(libdir) ; $(__richtextdll___so_symlinks_uninst_cmd))
-@COND_USE_PCH_1@.pch/wxprec_richtextdll/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_richtextdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(RICHTEXTDLL_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_richtextdll/wx/wxprec.h.gch:
+@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_richtextdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(RICHTEXTDLL_CXXFLAGS)
@COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(RICHTEXTLIB_OBJECTS)
@COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@ rm -f $@
@COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@ $(AR) $(AROPTIONS) $@ $(RICHTEXTLIB_OBJECTS)
@COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@ $(RANLIB) $@
-@COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@install_richtextlib:
+@COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@install_richtextlib: $(__richtextlib___depname)
@COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@uninstall_richtextlib:
@COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_USE_PCH_1@.pch/wxprec_richtextlib/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_richtextlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(RICHTEXTLIB_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_richtextlib/wx/wxprec.h.gch:
+@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_richtextlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(RICHTEXTLIB_CXXFLAGS)
@COND_MONOLITHIC_0_USE_RICHTEXT_1@wxrichtext: $(____wxrichtext_namedll_DEP) $(____wxrichtext_namelib_DEP)
@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(STCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__wxscintilla___depname) $(__stcdll___win32rc) $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(SHARED_LD_CXX) $@ $(STCDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__stcdll___macinstnamecmd) $(__stcdll___importlib) $(__stcdll___soname_flags) $(WXMACVERSION_CMD) $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(SHARED_LD_CXX) $@ $(STCDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(__stcdll___macinstnamecmd) $(__stcdll___importlib) $(__stcdll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(LIBS)
@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@
@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(__stcdll___so_symlinks_cmd)
-@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@install_stcdll:
+@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@install_stcdll: $(__stcdll___depname)
@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
@@ -13253,32 +13353,32 @@ distclean: clean
@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ (cd $(DESTDIR)$(libdir) ; $(__stcdll___so_symlinks_uninst_cmd))
-@COND_USE_PCH_1@.pch/wxprec_stcdll/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_stcdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(STCDLL_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_stcdll/wx/wxprec.h.gch:
+@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_stcdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(STCDLL_CXXFLAGS)
@COND_MONOLITHIC_0_SHARED_0_USE_STC_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(STCLIB_OBJECTS) $(__wxscintilla___depname)
@COND_MONOLITHIC_0_SHARED_0_USE_STC_1@ rm -f $@
@COND_MONOLITHIC_0_SHARED_0_USE_STC_1@ $(AR) $(AROPTIONS) $@ $(STCLIB_OBJECTS)
@COND_MONOLITHIC_0_SHARED_0_USE_STC_1@ $(RANLIB) $@
-@COND_MONOLITHIC_0_SHARED_0_USE_STC_1@install_stclib:
+@COND_MONOLITHIC_0_SHARED_0_USE_STC_1@install_stclib: $(__stclib___depname)
@COND_MONOLITHIC_0_SHARED_0_USE_STC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_0_USE_STC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_0_USE_STC_1@uninstall_stclib:
@COND_MONOLITHIC_0_SHARED_0_USE_STC_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_USE_PCH_1@.pch/wxprec_stclib/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_stclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(STCLIB_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_stclib/wx/wxprec.h.gch:
+@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_stclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(STCLIB_CXXFLAGS)
@COND_MONOLITHIC_0_USE_STC_1@wxstc: $(____wxstc_namedll_DEP) $(____wxstc_namelib_DEP)
@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__gldll___win32rc) $(__basedll___depname) $(__coredll___depname) $(__monodll___depname)
-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(SHARED_LD_CXX) $@ $(GLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__gldll___macinstnamecmd) $(__gldll___importlib) $(__gldll___soname_flags) $(WXMACVERSION_CMD) $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) $(EXTRALIBS_OPENGL)
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(SHARED_LD_CXX) $@ $(GLDLL_OBJECTS) -L$(LIBDIRNAME) $(__gldll___macinstnamecmd) $(__gldll___importlib) $(__gldll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) $(EXTRALIBS_OPENGL) $(LIBS)
@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@
@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(__gldll___so_symlinks_cmd)
-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@install_gldll:
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@install_gldll: $(__gldll___depname)
@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
@@ -13289,30 +13389,30 @@ distclean: clean
@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ (cd $(DESTDIR)$(libdir) ; $(__gldll___so_symlinks_uninst_cmd))
-@COND_USE_PCH_1@.pch/wxprec_gldll/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_gldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GLDLL_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_gldll/wx/wxprec.h.gch:
+@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_gldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GLDLL_CXXFLAGS)
@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(GLLIB_OBJECTS)
@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ rm -f $@
@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ $(AR) $(AROPTIONS) $@ $(GLLIB_OBJECTS)
@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ $(RANLIB) $@
-@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@install_gllib:
+@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@install_gllib: $(__gllib___depname)
@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@uninstall_gllib:
@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_USE_PCH_1@.pch/wxprec_gllib/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_gllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GLLIB_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_gllib/wx/wxprec.h.gch:
+@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_gllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GLLIB_CXXFLAGS)
@COND_USE_GUI_1_USE_OPENGL_1@wxgl: $(____wxgl_namedll_DEP) $(____wxgl_namelib_DEP)
@COND_WITH_PLUGIN_SDL_1@$(DLLPREFIX_MODULE)sound_sdl$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE): $(SOUND_SDL_OBJECTS)
-@COND_WITH_PLUGIN_SDL_1@ $(SHARED_LD_MODULE_CXX) $@ $(SOUND_SDL_OBJECTS) $(LDFLAGS) $(LIBS) $(EXTRALIBS_SDL)
+@COND_WITH_PLUGIN_SDL_1@ $(SHARED_LD_MODULE_CXX) $@ $(SOUND_SDL_OBJECTS) $(LDFLAGS) $(EXTRALIBS_SDL) $(LIBS)
-@COND_WITH_PLUGIN_SDL_1@install_sound_sdl:
+@COND_WITH_PLUGIN_SDL_1@install_sound_sdl: $(__sound_sdl___depname)
@COND_WITH_PLUGIN_SDL_1@ $(INSTALL_DIR) $(DESTDIR)$(PLUGINS_INST_DIR)
@COND_WITH_PLUGIN_SDL_1@ $(INSTALL_PROGRAM) $(DLLPREFIX_MODULE)sound_sdl$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE) $(DESTDIR)$(PLUGINS_INST_DIR)
@@ -14255,6 +14355,9 @@ monodll_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp $(MONODLL_ODEP)
monodll_zstream.o: $(srcdir)/src/common/zstream.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/zstream.cpp
+monodll_unix_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp
+
monodll_basemsw.o: $(srcdir)/src/msw/basemsw.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/basemsw.cpp
@@ -14267,9 +14370,15 @@ monodll_debughlp.o: $(srcdir)/src/msw/debughlp.cpp $(MONODLL_ODEP)
monodll_dde.o: $(srcdir)/src/msw/dde.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dde.cpp
+monodll_msw_dir.o: $(srcdir)/src/msw/dir.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dir.cpp
+
monodll_dlmsw.o: $(srcdir)/src/msw/dlmsw.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dlmsw.cpp
+monodll_msw_mimetype.o: $(srcdir)/src/msw/mimetype.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mimetype.cpp
+
monodll_power.o: $(srcdir)/src/msw/power.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/power.cpp
@@ -14279,9 +14388,33 @@ monodll_regconf.o: $(srcdir)/src/msw/regconf.cpp $(MONODLL_ODEP)
monodll_registry.o: $(srcdir)/src/msw/registry.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/registry.cpp
+monodll_msw_snglinst.o: $(srcdir)/src/msw/snglinst.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/snglinst.cpp
+
+monodll_msw_stackwalk.o: $(srcdir)/src/msw/stackwalk.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/stackwalk.cpp
+
+monodll_msw_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/stdpaths.cpp
+
+monodll_msw_thread.o: $(srcdir)/src/msw/thread.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/thread.cpp
+
+monodll_msw_timer.o: $(srcdir)/src/msw/timer.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/timer.cpp
+
+monodll_msw_utils.o: $(srcdir)/src/msw/utils.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/utils.cpp
+
+monodll_msw_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/utilsexc.cpp
+
monodll_time.o: $(srcdir)/src/msw/wince/time.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/time.cpp
+monodll_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/mimetype.cpp
+
monodll_cfstring.o: $(srcdir)/src/osx/core/cfstring.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/cfstring.cpp
@@ -14297,6 +14430,30 @@ monodll_strconv_cf.o: $(srcdir)/src/osx/core/strconv_cf.cpp $(MONODLL_ODEP)
monodll_utilsexc_base.o: $(srcdir)/src/osx/core/utilsexc_base.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_base.cpp
+monodll_os2_dir.o: $(srcdir)/src/os2/dir.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dir.cpp
+
+monodll_os2_mimetype.o: $(srcdir)/src/os2/mimetype.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/mimetype.cpp
+
+monodll_os2_stdpaths.o: $(srcdir)/src/os2/stdpaths.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/stdpaths.cpp
+
+monodll_os2_thread.o: $(srcdir)/src/os2/thread.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/thread.cpp
+
+monodll_os2_utils.o: $(srcdir)/src/os2/utils.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/utils.cpp
+
+monodll_os2_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/utilsexc.cpp
+
+monodll_msdos_dir.o: $(srcdir)/src/msdos/dir.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msdos/dir.cpp
+
+monodll_msdos_mimetype.o: $(srcdir)/src/msdos/mimetype.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msdos/mimetype.cpp
+
monodll_utilsdos.o: $(srcdir)/src/msdos/utilsdos.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msdos/utilsdos.cpp
@@ -14312,15 +14469,27 @@ monodll_msgout.o: $(srcdir)/src/common/msgout.cpp $(MONODLL_ODEP)
monodll_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/utilscmn.cpp
+monodll_msw_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp
+
+monodll_msw_main.o: $(srcdir)/src/msw/main.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/main.cpp
+
monodll_mslu.o: $(srcdir)/src/msw/mslu.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mslu.cpp
monodll_volume.o: $(srcdir)/src/msw/volume.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/volume.cpp
+monodll_carbon_utils.o: $(srcdir)/src/osx/carbon/utils.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/utils.cpp
+
monodll_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/uma.cpp
+monodll_osx_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm
+
monodll_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fs_inet.cpp
@@ -14351,6 +14520,9 @@ monodll_socket.o: $(srcdir)/src/common/socket.cpp $(MONODLL_ODEP)
monodll_url.o: $(srcdir)/src/common/url.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/url.cpp
+monodll_msw_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gsocket.cpp
+
monodll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gsockmsw.cpp
@@ -14366,1880 +14538,2168 @@ monodll_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(MONODLL_ODEP)
monodll_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp
+monodll_gtk_bmpbuttn.o: $(srcdir)/src/gtk/bmpbuttn.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/bmpbuttn.cpp
+
+monodll_gtk_button.o: $(srcdir)/src/gtk/button.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/button.cpp
+
+monodll_gtk_checkbox.o: $(srcdir)/src/gtk/checkbox.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/checkbox.cpp
+
+monodll_gtk_checklst.o: $(srcdir)/src/gtk/checklst.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/checklst.cpp
+
+monodll_gtk_choice.o: $(srcdir)/src/gtk/choice.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/choice.cpp
+
monodll_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp
+monodll_gtk_colordlg.o: $(srcdir)/src/gtk/colordlg.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/colordlg.cpp
+
+monodll_gtk_combobox.o: $(srcdir)/src/gtk/combobox.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/combobox.cpp
+
+monodll_gtk_control.o: $(srcdir)/src/gtk/control.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/control.cpp
+
monodll_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/clrpicker.cpp
+monodll_gtk_dialog.o: $(srcdir)/src/gtk/dialog.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dialog.cpp
+
monodll_fontpicker.o: $(srcdir)/src/gtk/fontpicker.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/fontpicker.cpp
monodll_filepicker.o: $(srcdir)/src/gtk/filepicker.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/filepicker.cpp
+monodll_gtk_dirdlg.o: $(srcdir)/src/gtk/dirdlg.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dirdlg.cpp
+
+monodll_gtk_filedlg.o: $(srcdir)/src/gtk/filedlg.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/filedlg.cpp
+
+monodll_gtk_fontdlg.o: $(srcdir)/src/gtk/fontdlg.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/fontdlg.cpp
+
+monodll_gtk_frame.o: $(srcdir)/src/gtk/frame.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/frame.cpp
+
+monodll_gtk_gauge.o: $(srcdir)/src/gtk/gauge.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/gauge.cpp
+
monodll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/gnome/gprint.cpp
monodll_gvfs.o: $(srcdir)/src/gtk/gnome/gvfs.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/gnome/gvfs.cpp
+monodll_gtk_print.o: $(srcdir)/src/gtk/print.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/print.cpp
+
+monodll_gtk_listbox.o: $(srcdir)/src/gtk/listbox.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/listbox.cpp
+
+monodll_gtk_mdi.o: $(srcdir)/src/gtk/mdi.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/mdi.cpp
+
+monodll_gtk_menu.o: $(srcdir)/src/gtk/menu.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/menu.cpp
+
monodll_mnemonics.o: $(srcdir)/src/gtk/mnemonics.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/mnemonics.cpp
-monodll_treeentry_gtk.o: $(srcdir)/src/gtk/treeentry_gtk.c $(MONODLL_ODEP)
- $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/gtk/treeentry_gtk.c
+monodll_gtk_msgdlg.o: $(srcdir)/src/gtk/msgdlg.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/msgdlg.cpp
-monodll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/bmpmotif.cpp
+monodll_gtk_nativewin.o: $(srcdir)/src/gtk/nativewin.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/nativewin.cpp
-monodll_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/combobox_native.cpp
+monodll_gtk_notebook.o: $(srcdir)/src/gtk/notebook.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/notebook.cpp
-monodll_gsockmot.o: $(srcdir)/src/motif/gsockmot.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/gsockmot.cpp
+monodll_gtk_radiobox.o: $(srcdir)/src/gtk/radiobox.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/radiobox.cpp
-monodll_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c $(MONODLL_ODEP)
- $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/motif/xmcombo/xmcombo.c
+monodll_gtk_radiobut.o: $(srcdir)/src/gtk/radiobut.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/radiobut.cpp
-monodll_choicece.o: $(srcdir)/src/msw/wince/choicece.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/choicece.cpp
+monodll_gtk_scrolbar.o: $(srcdir)/src/gtk/scrolbar.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/scrolbar.cpp
-monodll_crt.o: $(srcdir)/src/msw/wince/crt.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/crt.cpp
+monodll_gtk_scrolwin.o: $(srcdir)/src/gtk/scrolwin.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/scrolwin.cpp
-monodll_filedlgwce.o: $(srcdir)/src/msw/wince/filedlgwce.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/filedlgwce.cpp
+monodll_gtk_slider.o: $(srcdir)/src/gtk/slider.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/slider.cpp
-monodll_filefnwce.o: $(srcdir)/src/msw/wince/filefnwce.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/filefnwce.cpp
+monodll_gtk_spinbutt.o: $(srcdir)/src/gtk/spinbutt.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/spinbutt.cpp
-monodll_helpwce.o: $(srcdir)/src/msw/wince/helpwce.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/helpwce.cpp
+monodll_gtk_spinctrl.o: $(srcdir)/src/gtk/spinctrl.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/spinctrl.cpp
-monodll_menuce.o: $(srcdir)/src/msw/wince/menuce.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/menuce.cpp
+monodll_gtk_statbmp.o: $(srcdir)/src/gtk/statbmp.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/statbmp.cpp
-monodll_tbarwce.o: $(srcdir)/src/msw/wince/tbarwce.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/tbarwce.cpp
+monodll_gtk_statbox.o: $(srcdir)/src/gtk/statbox.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/statbox.cpp
-monodll_textctrlce.o: $(srcdir)/src/msw/wince/textctrlce.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/textctrlce.cpp
+monodll_gtk_statline.o: $(srcdir)/src/gtk/statline.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/statline.cpp
-monodll_listctrl_mac.o: $(srcdir)/src/osx/carbon/listctrl_mac.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/listctrl_mac.cpp
+monodll_gtk_stattext.o: $(srcdir)/src/gtk/stattext.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/stattext.cpp
-monodll_notebmac.o: $(srcdir)/src/osx/carbon/notebmac.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/notebmac.cpp
+monodll_gtk_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/tbargtk.cpp
-monodll_statlmac.o: $(srcdir)/src/osx/carbon/statlmac.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statlmac.cpp
+monodll_gtk_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/textctrl.cpp
-monodll_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/htmlctrl/webkit/webkit.mm
+monodll_gtk_textentry.o: $(srcdir)/src/gtk/textentry.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/textentry.cpp
-monodll_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/NSBox.mm
+monodll_gtk_tglbtn.o: $(srcdir)/src/gtk/tglbtn.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/tglbtn.cpp
-monodll_NSButton.o: $(srcdir)/src/cocoa/NSButton.mm $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/NSButton.mm
+monodll_treeentry_gtk.o: $(srcdir)/src/gtk/treeentry_gtk.c $(MONODLL_ODEP)
+ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/gtk/treeentry_gtk.c
-monodll_NSControl.o: $(srcdir)/src/cocoa/NSControl.mm $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/NSControl.mm
+monodll_gtk1_bmpbuttn.o: $(srcdir)/src/gtk1/bmpbuttn.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/bmpbuttn.cpp
-monodll_NSMenu.o: $(srcdir)/src/cocoa/NSMenu.mm $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/NSMenu.mm
+monodll_gtk1_button.o: $(srcdir)/src/gtk1/button.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/button.cpp
-monodll_NSPanel.o: $(srcdir)/src/cocoa/NSPanel.mm $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/NSPanel.mm
+monodll_gtk1_checkbox.o: $(srcdir)/src/gtk1/checkbox.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/checkbox.cpp
-monodll_NSScroller.o: $(srcdir)/src/cocoa/NSScroller.mm $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/NSScroller.mm
+monodll_gtk1_checklst.o: $(srcdir)/src/gtk1/checklst.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/checklst.cpp
-monodll_NSSlider.o: $(srcdir)/src/cocoa/NSSlider.mm $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/NSSlider.mm
+monodll_gtk1_choice.o: $(srcdir)/src/gtk1/choice.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/choice.cpp
-monodll_NSTabView.o: $(srcdir)/src/cocoa/NSTabView.mm $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/NSTabView.mm
+monodll_gtk1_combobox.o: $(srcdir)/src/gtk1/combobox.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/combobox.cpp
-monodll_NSTableView.o: $(srcdir)/src/cocoa/NSTableView.mm $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/NSTableView.mm
+monodll_gtk1_control.o: $(srcdir)/src/gtk1/control.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/control.cpp
-monodll_NSTextField.o: $(srcdir)/src/cocoa/NSTextField.mm $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/NSTextField.mm
+monodll_gtk1_dialog.o: $(srcdir)/src/gtk1/dialog.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/dialog.cpp
-monodll_NSView.o: $(srcdir)/src/cocoa/NSView.mm $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/NSView.mm
+monodll_gtk1_filedlg.o: $(srcdir)/src/gtk1/filedlg.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/filedlg.cpp
-monodll_NSWindow.o: $(srcdir)/src/cocoa/NSWindow.mm $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/NSWindow.mm
+monodll_gtk1_fontdlg.o: $(srcdir)/src/gtk1/fontdlg.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/fontdlg.cpp
-monodll_ObjcRef.o: $(srcdir)/src/cocoa/ObjcRef.mm $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/ObjcRef.mm
+monodll_gtk1_frame.o: $(srcdir)/src/gtk1/frame.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/frame.cpp
-monodll_mbarman.o: $(srcdir)/src/cocoa/mbarman.mm $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/mbarman.mm
+monodll_gtk1_gauge.o: $(srcdir)/src/gtk1/gauge.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/gauge.cpp
-monodll_statline2.o: $(srcdir)/src/cocoa/statline2.mm $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/statline2.mm
+monodll_gtk1_listbox.o: $(srcdir)/src/gtk1/listbox.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/listbox.cpp
-monodll_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/gsockpm.cpp
+monodll_gtk1_mdi.o: $(srcdir)/src/gtk1/mdi.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/mdi.cpp
-monodll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/ctrlrend.cpp
+monodll_gtk1_menu.o: $(srcdir)/src/gtk1/menu.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/menu.cpp
-monodll_framuniv.o: $(srcdir)/src/univ/framuniv.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/framuniv.cpp
+monodll_gtk1_notebook.o: $(srcdir)/src/gtk1/notebook.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/notebook.cpp
-monodll_inpcons.o: $(srcdir)/src/univ/inpcons.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/inpcons.cpp
+monodll_gtk1_radiobox.o: $(srcdir)/src/gtk1/radiobox.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/radiobox.cpp
-monodll_inphand.o: $(srcdir)/src/univ/inphand.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/inphand.cpp
+monodll_gtk1_radiobut.o: $(srcdir)/src/gtk1/radiobut.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/radiobut.cpp
-monodll_scrarrow.o: $(srcdir)/src/univ/scrarrow.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/scrarrow.cpp
+monodll_gtk1_scrolbar.o: $(srcdir)/src/gtk1/scrolbar.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/scrolbar.cpp
-monodll_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/scrthumb.cpp
+monodll_gtk1_scrolwin.o: $(srcdir)/src/gtk1/scrolwin.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/scrolwin.cpp
-monodll_settingsuniv.o: $(srcdir)/src/univ/settingsuniv.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/settingsuniv.cpp
+monodll_gtk1_slider.o: $(srcdir)/src/gtk1/slider.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/slider.cpp
-monodll_stdrend.o: $(srcdir)/src/univ/stdrend.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/stdrend.cpp
+monodll_gtk1_spinbutt.o: $(srcdir)/src/gtk1/spinbutt.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/spinbutt.cpp
-monodll_theme.o: $(srcdir)/src/univ/theme.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/theme.cpp
+monodll_gtk1_spinctrl.o: $(srcdir)/src/gtk1/spinctrl.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/spinctrl.cpp
-monodll_topluniv.o: $(srcdir)/src/univ/topluniv.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/topluniv.cpp
+monodll_gtk1_statbmp.o: $(srcdir)/src/gtk1/statbmp.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/statbmp.cpp
-monodll_winuniv.o: $(srcdir)/src/univ/winuniv.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/winuniv.cpp
+monodll_gtk1_statbox.o: $(srcdir)/src/gtk1/statbox.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/statbox.cpp
-monodll_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/themes/gtk.cpp
+monodll_gtk1_statline.o: $(srcdir)/src/gtk1/statline.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/statline.cpp
-monodll_metal.o: $(srcdir)/src/univ/themes/metal.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/themes/metal.cpp
+monodll_gtk1_stattext.o: $(srcdir)/src/gtk1/stattext.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/stattext.cpp
-monodll_mono.o: $(srcdir)/src/univ/themes/mono.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/themes/mono.cpp
+monodll_gtk1_tbargtk.o: $(srcdir)/src/gtk1/tbargtk.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/tbargtk.cpp
-monodll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/themes/win32.cpp
+monodll_gtk1_textctrl.o: $(srcdir)/src/gtk1/textctrl.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/textctrl.cpp
-monodll_animate.o: $(srcdir)/src/gtk/animate.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/animate.cpp
+monodll_gtk1_tglbtn.o: $(srcdir)/src/gtk1/tglbtn.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/tglbtn.cpp
-monodll_hyperlink.o: $(srcdir)/src/gtk/hyperlink.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/hyperlink.cpp
+monodll_motif_accel.o: $(srcdir)/src/motif/accel.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/accel.cpp
-monodll_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/mediactrlcmn.cpp
+monodll_motif_app.o: $(srcdir)/src/motif/app.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/app.cpp
-monodll_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/helpbest.cpp
+monodll_motif_bmpbuttn.o: $(srcdir)/src/motif/bmpbuttn.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/bmpbuttn.cpp
-monodll_helpctrl.o: $(srcdir)/src/html/helpctrl.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/helpctrl.cpp
+monodll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/bmpmotif.cpp
-monodll_helpdata.o: $(srcdir)/src/html/helpdata.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/helpdata.cpp
+monodll_motif_button.o: $(srcdir)/src/motif/button.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/button.cpp
-monodll_helpdlg.o: $(srcdir)/src/html/helpdlg.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/helpdlg.cpp
+monodll_motif_checkbox.o: $(srcdir)/src/motif/checkbox.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/checkbox.cpp
-monodll_helpfrm.o: $(srcdir)/src/html/helpfrm.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/helpfrm.cpp
+monodll_motif_checklst.o: $(srcdir)/src/motif/checklst.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/checklst.cpp
-monodll_helpwnd.o: $(srcdir)/src/html/helpwnd.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/helpwnd.cpp
+monodll_motif_choice.o: $(srcdir)/src/motif/choice.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/choice.cpp
-monodll_htmlcell.o: $(srcdir)/src/html/htmlcell.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/htmlcell.cpp
+monodll_motif_clipbrd.o: $(srcdir)/src/motif/clipbrd.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/clipbrd.cpp
-monodll_htmlfilt.o: $(srcdir)/src/html/htmlfilt.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/htmlfilt.cpp
+monodll_motif_colour.o: $(srcdir)/src/motif/colour.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/colour.cpp
-monodll_htmlpars.o: $(srcdir)/src/html/htmlpars.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/htmlpars.cpp
+monodll_motif_combobox.o: $(srcdir)/src/motif/combobox.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/combobox.cpp
-monodll_htmltag.o: $(srcdir)/src/html/htmltag.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/htmltag.cpp
+monodll_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/combobox_native.cpp
-monodll_htmlwin.o: $(srcdir)/src/html/htmlwin.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/htmlwin.cpp
+monodll_motif_control.o: $(srcdir)/src/motif/control.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/control.cpp
-monodll_htmprint.o: $(srcdir)/src/html/htmprint.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/htmprint.cpp
+monodll_motif_cursor.o: $(srcdir)/src/motif/cursor.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/cursor.cpp
-monodll_m_dflist.o: $(srcdir)/src/html/m_dflist.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_dflist.cpp
+monodll_motif_data.o: $(srcdir)/src/motif/data.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/data.cpp
-monodll_m_fonts.o: $(srcdir)/src/html/m_fonts.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_fonts.cpp
+monodll_motif_dataobj.o: $(srcdir)/src/motif/dataobj.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/dataobj.cpp
-monodll_m_hline.o: $(srcdir)/src/html/m_hline.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_hline.cpp
+monodll_motif_dc.o: $(srcdir)/src/motif/dc.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/dc.cpp
-monodll_m_image.o: $(srcdir)/src/html/m_image.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_image.cpp
+monodll_motif_dcclient.o: $(srcdir)/src/motif/dcclient.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/dcclient.cpp
-monodll_m_layout.o: $(srcdir)/src/html/m_layout.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_layout.cpp
+monodll_motif_dcmemory.o: $(srcdir)/src/motif/dcmemory.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/dcmemory.cpp
-monodll_m_links.o: $(srcdir)/src/html/m_links.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_links.cpp
+monodll_motif_dcscreen.o: $(srcdir)/src/motif/dcscreen.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/dcscreen.cpp
-monodll_m_list.o: $(srcdir)/src/html/m_list.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_list.cpp
+monodll_motif_dialog.o: $(srcdir)/src/motif/dialog.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/dialog.cpp
-monodll_m_pre.o: $(srcdir)/src/html/m_pre.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_pre.cpp
+monodll_motif_evtloop.o: $(srcdir)/src/motif/evtloop.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/evtloop.cpp
-monodll_m_style.o: $(srcdir)/src/html/m_style.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_style.cpp
+monodll_motif_filedlg.o: $(srcdir)/src/motif/filedlg.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/filedlg.cpp
-monodll_m_tables.o: $(srcdir)/src/html/m_tables.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_tables.cpp
+monodll_motif_font.o: $(srcdir)/src/motif/font.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/font.cpp
-monodll_winpars.o: $(srcdir)/src/html/winpars.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/winpars.cpp
+monodll_motif_frame.o: $(srcdir)/src/motif/frame.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/frame.cpp
-monodll_htmllbox.o: $(srcdir)/src/generic/htmllbox.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/htmllbox.cpp
+monodll_motif_gauge.o: $(srcdir)/src/motif/gauge.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/gauge.cpp
-monodll_debugrpt.o: $(srcdir)/src/common/debugrpt.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/debugrpt.cpp
+monodll_gsockmot.o: $(srcdir)/src/motif/gsockmot.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/gsockmot.cpp
-monodll_dbgrptg.o: $(srcdir)/src/generic/dbgrptg.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dbgrptg.cpp
+monodll_motif_icon.o: $(srcdir)/src/motif/icon.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/icon.cpp
-monodll_xh_animatctrl.o: $(srcdir)/src/xrc/xh_animatctrl.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_animatctrl.cpp
+monodll_motif_listbox.o: $(srcdir)/src/motif/listbox.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/listbox.cpp
-monodll_xh_bmp.o: $(srcdir)/src/xrc/xh_bmp.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_bmp.cpp
+monodll_motif_main.o: $(srcdir)/src/motif/main.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/main.cpp
-monodll_xh_bmpcbox.o: $(srcdir)/src/xrc/xh_bmpcbox.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_bmpcbox.cpp
+monodll_motif_mdi.o: $(srcdir)/src/motif/mdi.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/mdi.cpp
-monodll_xh_bmpbt.o: $(srcdir)/src/xrc/xh_bmpbt.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_bmpbt.cpp
+monodll_motif_menu.o: $(srcdir)/src/motif/menu.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/menu.cpp
-monodll_xh_bttn.o: $(srcdir)/src/xrc/xh_bttn.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_bttn.cpp
+monodll_motif_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/menuitem.cpp
-monodll_xh_cald.o: $(srcdir)/src/xrc/xh_cald.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_cald.cpp
+monodll_motif_minifram.o: $(srcdir)/src/motif/minifram.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/minifram.cpp
-monodll_xh_chckb.o: $(srcdir)/src/xrc/xh_chckb.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_chckb.cpp
+monodll_motif_msgdlg.o: $(srcdir)/src/motif/msgdlg.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/msgdlg.cpp
-monodll_xh_chckl.o: $(srcdir)/src/xrc/xh_chckl.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_chckl.cpp
+monodll_motif_popupwin.o: $(srcdir)/src/motif/popupwin.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/popupwin.cpp
-monodll_xh_choic.o: $(srcdir)/src/xrc/xh_choic.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_choic.cpp
+monodll_motif_radiobox.o: $(srcdir)/src/motif/radiobox.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/radiobox.cpp
-monodll_xh_choicbk.o: $(srcdir)/src/xrc/xh_choicbk.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_choicbk.cpp
+monodll_motif_radiobut.o: $(srcdir)/src/motif/radiobut.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/radiobut.cpp
-monodll_xh_clrpicker.o: $(srcdir)/src/xrc/xh_clrpicker.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_clrpicker.cpp
+monodll_motif_scrolbar.o: $(srcdir)/src/motif/scrolbar.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/scrolbar.cpp
-monodll_xh_collpane.o: $(srcdir)/src/xrc/xh_collpane.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_collpane.cpp
+monodll_motif_settings.o: $(srcdir)/src/motif/settings.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/settings.cpp
-monodll_xh_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_combo.cpp
+monodll_motif_slider.o: $(srcdir)/src/motif/slider.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/slider.cpp
-monodll_xh_datectrl.o: $(srcdir)/src/xrc/xh_datectrl.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_datectrl.cpp
+monodll_motif_spinbutt.o: $(srcdir)/src/motif/spinbutt.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/spinbutt.cpp
-monodll_xh_dirpicker.o: $(srcdir)/src/xrc/xh_dirpicker.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_dirpicker.cpp
+monodll_motif_statbmp.o: $(srcdir)/src/motif/statbmp.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/statbmp.cpp
-monodll_xh_dlg.o: $(srcdir)/src/xrc/xh_dlg.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_dlg.cpp
+monodll_motif_statbox.o: $(srcdir)/src/motif/statbox.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/statbox.cpp
-monodll_xh_frame.o: $(srcdir)/src/xrc/xh_frame.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_frame.cpp
+monodll_motif_stattext.o: $(srcdir)/src/motif/stattext.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/stattext.cpp
-monodll_xh_mdi.o: $(srcdir)/src/xrc/xh_mdi.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_mdi.cpp
+monodll_motif_textctrl.o: $(srcdir)/src/motif/textctrl.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/textctrl.cpp
-monodll_xh_filepicker.o: $(srcdir)/src/xrc/xh_filepicker.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_filepicker.cpp
+monodll_motif_textentry.o: $(srcdir)/src/motif/textentry.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/textentry.cpp
-monodll_xh_fontpicker.o: $(srcdir)/src/xrc/xh_fontpicker.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_fontpicker.cpp
+monodll_motif_timer.o: $(srcdir)/src/motif/timer.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/timer.cpp
-monodll_xh_gauge.o: $(srcdir)/src/xrc/xh_gauge.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_gauge.cpp
+monodll_motif_toolbar.o: $(srcdir)/src/motif/toolbar.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/toolbar.cpp
-monodll_xh_gdctl.o: $(srcdir)/src/xrc/xh_gdctl.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_gdctl.cpp
+monodll_motif_toplevel.o: $(srcdir)/src/motif/toplevel.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/toplevel.cpp
-monodll_xh_grid.o: $(srcdir)/src/xrc/xh_grid.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_grid.cpp
+monodll_motif_utils.o: $(srcdir)/src/motif/utils.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/utils.cpp
-monodll_xh_html.o: $(srcdir)/src/xrc/xh_html.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_html.cpp
+monodll_motif_window.o: $(srcdir)/src/motif/window.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/window.cpp
-monodll_xh_hyperlink.o: $(srcdir)/src/xrc/xh_hyperlink.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_hyperlink.cpp
+monodll_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c $(MONODLL_ODEP)
+ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/motif/xmcombo/xmcombo.c
-monodll_xh_listb.o: $(srcdir)/src/xrc/xh_listb.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_listb.cpp
+monodll_generic_notebook.o: $(srcdir)/src/generic/notebook.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/notebook.cpp
-monodll_xh_listbk.o: $(srcdir)/src/xrc/xh_listbk.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_listbk.cpp
+monodll_generic_statline.o: $(srcdir)/src/generic/statline.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statline.cpp
-monodll_xh_listc.o: $(srcdir)/src/xrc/xh_listc.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_listc.cpp
+monodll_msw_checklst.o: $(srcdir)/src/msw/checklst.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp
-monodll_xh_menu.o: $(srcdir)/src/xrc/xh_menu.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_menu.cpp
+monodll_msw_fdrepdlg.o: $(srcdir)/src/msw/fdrepdlg.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/fdrepdlg.cpp
-monodll_xh_notbk.o: $(srcdir)/src/xrc/xh_notbk.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_notbk.cpp
+monodll_msw_fontdlg.o: $(srcdir)/src/msw/fontdlg.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/fontdlg.cpp
-monodll_xh_odcombo.o: $(srcdir)/src/xrc/xh_odcombo.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_odcombo.cpp
+monodll_wince_checklst.o: $(srcdir)/src/msw/wince/checklst.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/checklst.cpp
-monodll_xh_panel.o: $(srcdir)/src/xrc/xh_panel.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_panel.cpp
+monodll_choicece.o: $(srcdir)/src/msw/wince/choicece.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/choicece.cpp
-monodll_xh_propdlg.o: $(srcdir)/src/xrc/xh_propdlg.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_propdlg.cpp
+monodll_crt.o: $(srcdir)/src/msw/wince/crt.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/crt.cpp
-monodll_xh_radbt.o: $(srcdir)/src/xrc/xh_radbt.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_radbt.cpp
+monodll_filedlgwce.o: $(srcdir)/src/msw/wince/filedlgwce.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/filedlgwce.cpp
-monodll_xh_radbx.o: $(srcdir)/src/xrc/xh_radbx.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_radbx.cpp
+monodll_filefnwce.o: $(srcdir)/src/msw/wince/filefnwce.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/filefnwce.cpp
-monodll_xh_scrol.o: $(srcdir)/src/xrc/xh_scrol.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_scrol.cpp
+monodll_helpwce.o: $(srcdir)/src/msw/wince/helpwce.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/helpwce.cpp
-monodll_xh_scwin.o: $(srcdir)/src/xrc/xh_scwin.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_scwin.cpp
+monodll_menuce.o: $(srcdir)/src/msw/wince/menuce.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/menuce.cpp
-monodll_xh_htmllbox.o: $(srcdir)/src/xrc/xh_htmllbox.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_htmllbox.cpp
+monodll_tbarwce.o: $(srcdir)/src/msw/wince/tbarwce.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/tbarwce.cpp
-monodll_xh_sizer.o: $(srcdir)/src/xrc/xh_sizer.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_sizer.cpp
+monodll_textctrlce.o: $(srcdir)/src/msw/wince/textctrlce.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/textctrlce.cpp
-monodll_xh_slidr.o: $(srcdir)/src/xrc/xh_slidr.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_slidr.cpp
+monodll_carbon_bmpbuttn.o: $(srcdir)/src/osx/carbon/bmpbuttn.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/bmpbuttn.cpp
-monodll_xh_spin.o: $(srcdir)/src/xrc/xh_spin.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_spin.cpp
+monodll_carbon_button.o: $(srcdir)/src/osx/carbon/button.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/button.cpp
-monodll_xh_split.o: $(srcdir)/src/xrc/xh_split.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_split.cpp
+monodll_carbon_checkbox.o: $(srcdir)/src/osx/carbon/checkbox.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/checkbox.cpp
-monodll_xh_srchctrl.o: $(srcdir)/src/xrc/xh_srchctrl.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_srchctrl.cpp
+monodll_carbon_choice.o: $(srcdir)/src/osx/carbon/choice.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/choice.cpp
-monodll_xh_statbar.o: $(srcdir)/src/xrc/xh_statbar.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_statbar.cpp
+monodll_carbon_colordlg.o: $(srcdir)/src/osx/carbon/colordlg.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/colordlg.cpp
-monodll_xh_stbmp.o: $(srcdir)/src/xrc/xh_stbmp.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_stbmp.cpp
+monodll_carbon_dialog.o: $(srcdir)/src/osx/carbon/dialog.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dialog.cpp
-monodll_xh_stbox.o: $(srcdir)/src/xrc/xh_stbox.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_stbox.cpp
+monodll_carbon_dirdlg.o: $(srcdir)/src/osx/carbon/dirdlg.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dirdlg.cpp
-monodll_xh_stlin.o: $(srcdir)/src/xrc/xh_stlin.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_stlin.cpp
+monodll_carbon_evtloop.o: $(srcdir)/src/osx/carbon/evtloop.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/evtloop.cpp
-monodll_xh_sttxt.o: $(srcdir)/src/xrc/xh_sttxt.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_sttxt.cpp
+monodll_carbon_filedlg.o: $(srcdir)/src/osx/carbon/filedlg.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/filedlg.cpp
-monodll_xh_text.o: $(srcdir)/src/xrc/xh_text.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_text.cpp
+monodll_carbon_gauge.o: $(srcdir)/src/osx/carbon/gauge.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/gauge.cpp
-monodll_xh_tglbtn.o: $(srcdir)/src/xrc/xh_tglbtn.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_tglbtn.cpp
+monodll_carbon_listbox.o: $(srcdir)/src/osx/carbon/listbox.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/listbox.cpp
-monodll_xh_toolb.o: $(srcdir)/src/xrc/xh_toolb.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_toolb.cpp
+monodll_listctrl_mac.o: $(srcdir)/src/osx/carbon/listctrl_mac.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/listctrl_mac.cpp
-monodll_xh_tree.o: $(srcdir)/src/xrc/xh_tree.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_tree.cpp
+monodll_carbon_menu.o: $(srcdir)/src/osx/carbon/menu.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/menu.cpp
-monodll_xh_treebk.o: $(srcdir)/src/xrc/xh_treebk.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_treebk.cpp
+monodll_carbon_menuitem.o: $(srcdir)/src/osx/carbon/menuitem.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/menuitem.cpp
-monodll_xh_unkwn.o: $(srcdir)/src/xrc/xh_unkwn.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_unkwn.cpp
+monodll_carbon_msgdlg.o: $(srcdir)/src/osx/carbon/msgdlg.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/msgdlg.cpp
-monodll_xh_wizrd.o: $(srcdir)/src/xrc/xh_wizrd.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_wizrd.cpp
+monodll_carbon_nonownedwnd.o: $(srcdir)/src/osx/carbon/nonownedwnd.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/nonownedwnd.cpp
-monodll_xmlres.o: $(srcdir)/src/xrc/xmlres.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xmlres.cpp
+monodll_notebmac.o: $(srcdir)/src/osx/carbon/notebmac.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/notebmac.cpp
-monodll_xmladv.o: $(srcdir)/src/xrc/xmladv.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xmladv.cpp
+monodll_carbon_radiobut.o: $(srcdir)/src/osx/carbon/radiobut.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/radiobut.cpp
-monodll_xmlrsall.o: $(srcdir)/src/xrc/xmlrsall.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xmlrsall.cpp
+monodll_carbon_region.o: $(srcdir)/src/osx/carbon/region.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/region.cpp
-monodll_framemanager.o: $(srcdir)/src/aui/framemanager.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/framemanager.cpp
+monodll_carbon_scrolbar.o: $(srcdir)/src/osx/carbon/scrolbar.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/scrolbar.cpp
-monodll_dockart.o: $(srcdir)/src/aui/dockart.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/dockart.cpp
+monodll_carbon_slider.o: $(srcdir)/src/osx/carbon/slider.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/slider.cpp
-monodll_floatpane.o: $(srcdir)/src/aui/floatpane.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/floatpane.cpp
+monodll_carbon_spinbutt.o: $(srcdir)/src/osx/carbon/spinbutt.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/spinbutt.cpp
-monodll_auibook.o: $(srcdir)/src/aui/auibook.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/auibook.cpp
+monodll_carbon_srchctrl.o: $(srcdir)/src/osx/carbon/srchctrl.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/srchctrl.cpp
-monodll_auibar.o: $(srcdir)/src/aui/auibar.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/auibar.cpp
+monodll_carbon_statbmp.o: $(srcdir)/src/osx/carbon/statbmp.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbmp.cpp
-monodll_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/tabmdi.cpp
+monodll_carbon_statbox.o: $(srcdir)/src/osx/carbon/statbox.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbox.cpp
-monodll_advprops.o: $(srcdir)/src/propgrid/advprops.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/propgrid/advprops.cpp
+monodll_statlmac.o: $(srcdir)/src/osx/carbon/statlmac.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statlmac.cpp
-monodll_editors.o: $(srcdir)/src/propgrid/editors.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/propgrid/editors.cpp
+monodll_carbon_stattext.o: $(srcdir)/src/osx/carbon/stattext.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/stattext.cpp
-monodll_manager.o: $(srcdir)/src/propgrid/manager.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/propgrid/manager.cpp
+monodll_carbon_textctrl.o: $(srcdir)/src/osx/carbon/textctrl.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/textctrl.cpp
-monodll_property.o: $(srcdir)/src/propgrid/property.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/propgrid/property.cpp
+monodll_carbon_tglbtn.o: $(srcdir)/src/osx/carbon/tglbtn.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/tglbtn.cpp
-monodll_propgrid.o: $(srcdir)/src/propgrid/propgrid.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/propgrid/propgrid.cpp
+monodll_carbon_toolbar.o: $(srcdir)/src/osx/carbon/toolbar.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/toolbar.cpp
-monodll_propgridiface.o: $(srcdir)/src/propgrid/propgridiface.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/propgrid/propgridiface.cpp
+monodll_carbon_tooltip.o: $(srcdir)/src/osx/carbon/tooltip.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/tooltip.cpp
-monodll_propgridpagestate.o: $(srcdir)/src/propgrid/propgridpagestate.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/propgrid/propgridpagestate.cpp
+monodll_carbon_window.o: $(srcdir)/src/osx/carbon/window.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/window.cpp
-monodll_props.o: $(srcdir)/src/propgrid/props.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/propgrid/props.cpp
+monodll_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/html/htmlctrl/webkit/webkit.mm
-monodll_richtextctrl.o: $(srcdir)/src/richtext/richtextctrl.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextctrl.cpp
+monodll_osx_cocoa_bmpbuttn.o: $(srcdir)/src/osx/cocoa/bmpbuttn.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/bmpbuttn.mm
-monodll_richtextbuffer.o: $(srcdir)/src/richtext/richtextbuffer.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextbuffer.cpp
+monodll_osx_cocoa_button.o: $(srcdir)/src/osx/cocoa/button.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/button.mm
-monodll_richtextstyles.o: $(srcdir)/src/richtext/richtextstyles.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextstyles.cpp
+monodll_osx_cocoa_checkbox.o: $(srcdir)/src/osx/cocoa/checkbox.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/checkbox.mm
-monodll_richtextxml.o: $(srcdir)/src/richtext/richtextxml.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextxml.cpp
+monodll_osx_cocoa_choice.o: $(srcdir)/src/osx/cocoa/choice.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/choice.mm
-monodll_richtexthtml.o: $(srcdir)/src/richtext/richtexthtml.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtexthtml.cpp
+monodll_osx_cocoa_dialog.o: $(srcdir)/src/osx/cocoa/dialog.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/dialog.mm
-monodll_richtextformatdlg.o: $(srcdir)/src/richtext/richtextformatdlg.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextformatdlg.cpp
+monodll_osx_cocoa_dirdlg.o: $(srcdir)/src/osx/cocoa/dirdlg.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/dirdlg.mm
-monodll_richtextsymboldlg.o: $(srcdir)/src/richtext/richtextsymboldlg.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextsymboldlg.cpp
+monodll_osx_cocoa_evtloop.o: $(srcdir)/src/osx/cocoa/evtloop.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/evtloop.mm
-monodll_richtextstyledlg.o: $(srcdir)/src/richtext/richtextstyledlg.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextstyledlg.cpp
+monodll_osx_cocoa_filedlg.o: $(srcdir)/src/osx/cocoa/filedlg.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/filedlg.mm
-monodll_richtextprint.o: $(srcdir)/src/richtext/richtextprint.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextprint.cpp
+monodll_osx_cocoa_gauge.o: $(srcdir)/src/osx/cocoa/gauge.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/gauge.mm
-monodll_stc.o: $(srcdir)/src/stc/stc.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/stc/stc.cpp
+monodll_osx_cocoa_listbox.o: $(srcdir)/src/osx/cocoa/listbox.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/listbox.mm
-monodll_PlatWX.o: $(srcdir)/src/stc/PlatWX.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/stc/PlatWX.cpp
+monodll_osx_cocoa_menu.o: $(srcdir)/src/osx/cocoa/menu.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/menu.mm
-monodll_ScintillaWX.o: $(srcdir)/src/stc/ScintillaWX.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/stc/ScintillaWX.cpp
+monodll_osx_cocoa_menuitem.o: $(srcdir)/src/osx/cocoa/menuitem.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/menuitem.mm
-monodll_xml.o: $(srcdir)/src/xml/xml.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xml/xml.cpp
+monodll_osx_cocoa_msgdlg.o: $(srcdir)/src/osx/cocoa/msgdlg.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/msgdlg.mm
-monodll_xtixml.o: $(srcdir)/src/common/xtixml.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/xtixml.cpp
+monodll_cocoa_nonownedwnd.o: $(srcdir)/src/osx/cocoa/nonownedwnd.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/nonownedwnd.mm
-monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound_sdl.cpp
+monodll_osx_cocoa_notebook.o: $(srcdir)/src/osx/cocoa/notebook.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/notebook.mm
-@COND_PLATFORM_UNIX_1@monodll_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp
+monodll_osx_cocoa_radiobut.o: $(srcdir)/src/osx/cocoa/radiobut.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/radiobut.mm
-@COND_PLATFORM_MACOSX_1@monodll_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp
+monodll_osx_cocoa_scrolbar.o: $(srcdir)/src/osx/cocoa/scrolbar.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/scrolbar.mm
-@COND_PLATFORM_OS2_1@monodll_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp
+monodll_osx_cocoa_slider.o: $(srcdir)/src/osx/cocoa/slider.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/slider.mm
-@COND_PLATFORM_UNIX_1@monodll_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp
+monodll_osx_cocoa_spinbutt.o: $(srcdir)/src/osx/cocoa/spinbutt.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/spinbutt.mm
-@COND_PLATFORM_MACOSX_1@monodll_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp
+monodll_cocoa_srchctrl.o: $(srcdir)/src/osx/cocoa/srchctrl.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/srchctrl.mm
-@COND_PLATFORM_OS2_1@monodll_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp
+monodll_osx_cocoa_statbox.o: $(srcdir)/src/osx/cocoa/statbox.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/statbox.mm
-@COND_PLATFORM_UNIX_1@monodll_epolldispatcher.o: $(srcdir)/src/unix/epolldispatcher.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/epolldispatcher.cpp
+monodll_cocoa_statline.o: $(srcdir)/src/osx/cocoa/statline.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/statline.mm
-@COND_PLATFORM_MACOSX_1@monodll_epolldispatcher.o: $(srcdir)/src/unix/epolldispatcher.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/epolldispatcher.cpp
+monodll_osx_cocoa_stattext.o: $(srcdir)/src/osx/cocoa/stattext.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/stattext.mm
-@COND_PLATFORM_UNIX_1@monodll_appunix.o: $(srcdir)/src/unix/appunix.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp
+monodll_osx_cocoa_textctrl.o: $(srcdir)/src/osx/cocoa/textctrl.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/textctrl.mm
-@COND_PLATFORM_MACOSX_1@monodll_appunix.o: $(srcdir)/src/unix/appunix.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp
+monodll_cocoa_tglbtn.o: $(srcdir)/src/osx/cocoa/tglbtn.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/tglbtn.mm
-@COND_PLATFORM_OS2_1@monodll_appunix.o: $(srcdir)/src/unix/appunix.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp
+monodll_osx_cocoa_toolbar.o: $(srcdir)/src/osx/cocoa/toolbar.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/toolbar.mm
-@COND_PLATFORM_UNIX_1@monodll_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp
+monodll_osx_cocoa_tooltip.o: $(srcdir)/src/osx/cocoa/tooltip.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/tooltip.mm
-@COND_PLATFORM_MACOSX_1@monodll_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp
+monodll_osx_cocoa_window.o: $(srcdir)/src/osx/cocoa/window.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/window.mm
-@COND_PLATFORM_OS2_1@monodll_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp
+monodll_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSBox.mm
-@COND_PLATFORM_UNIX_1@monodll_dir.o: $(srcdir)/src/unix/dir.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dir.cpp
+monodll_NSButton.o: $(srcdir)/src/cocoa/NSButton.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSButton.mm
-@COND_PLATFORM_MACOSX_1@monodll_dir.o: $(srcdir)/src/unix/dir.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dir.cpp
+monodll_NSControl.o: $(srcdir)/src/cocoa/NSControl.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSControl.mm
-@COND_PLATFORM_WIN32_1@monodll_dir.o: $(srcdir)/src/msw/dir.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dir.cpp
+monodll_NSMenu.o: $(srcdir)/src/cocoa/NSMenu.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSMenu.mm
-@COND_PLATFORM_OS2_1@monodll_dir.o: $(srcdir)/src/os2/dir.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dir.cpp
+monodll_NSPanel.o: $(srcdir)/src/cocoa/NSPanel.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSPanel.mm
-@COND_PLATFORM_MSDOS_1@monodll_dir.o: $(srcdir)/src/msdos/dir.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MSDOS_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msdos/dir.cpp
+monodll_NSScroller.o: $(srcdir)/src/cocoa/NSScroller.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSScroller.mm
-@COND_PLATFORM_UNIX_1@monodll_dlunix.o: $(srcdir)/src/unix/dlunix.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dlunix.cpp
+monodll_NSSlider.o: $(srcdir)/src/cocoa/NSSlider.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSSlider.mm
-@COND_PLATFORM_MACOSX_1@monodll_dlunix.o: $(srcdir)/src/unix/dlunix.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dlunix.cpp
+monodll_NSTabView.o: $(srcdir)/src/cocoa/NSTabView.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSTabView.mm
-@COND_PLATFORM_UNIX_1@monodll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
+monodll_NSTableView.o: $(srcdir)/src/cocoa/NSTableView.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSTableView.mm
-@COND_PLATFORM_MACOSX_1@monodll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
+monodll_NSTextField.o: $(srcdir)/src/cocoa/NSTextField.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSTextField.mm
-@COND_PLATFORM_WIN32_1@monodll_snglinst.o: $(srcdir)/src/msw/snglinst.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/snglinst.cpp
+monodll_NSView.o: $(srcdir)/src/cocoa/NSView.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSView.mm
-@COND_PLATFORM_UNIX_1@monodll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/stdpaths.cpp
+monodll_NSWindow.o: $(srcdir)/src/cocoa/NSWindow.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSWindow.mm
-@COND_PLATFORM_MACOSX_1@monodll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/stdpaths.cpp
+monodll_ObjcRef.o: $(srcdir)/src/cocoa/ObjcRef.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/ObjcRef.mm
-@COND_PLATFORM_WIN32_1@monodll_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/stdpaths.cpp
+monodll_cocoa_app.o: $(srcdir)/src/cocoa/app.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/app.mm
-@COND_PLATFORM_OS2_1@monodll_stdpaths.o: $(srcdir)/src/os2/stdpaths.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/stdpaths.cpp
+monodll_cocoa_bitmap.o: $(srcdir)/src/cocoa/bitmap.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/bitmap.mm
-@COND_PLATFORM_UNIX_1@monodll_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp
+monodll_src_cocoa_bmpbuttn.o: $(srcdir)/src/cocoa/bmpbuttn.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/bmpbuttn.mm
-@COND_PLATFORM_MACOSX_1@monodll_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp
+monodll_cocoa_brush.o: $(srcdir)/src/cocoa/brush.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/brush.mm
-@COND_PLATFORM_OS2_1@monodll_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp
+monodll_src_cocoa_button.o: $(srcdir)/src/cocoa/button.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/button.mm
-@COND_PLATFORM_UNIX_1@monodll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/threadpsx.cpp
+monodll_src_cocoa_checkbox.o: $(srcdir)/src/cocoa/checkbox.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/checkbox.mm
-@COND_PLATFORM_MACOSX_1@monodll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/threadpsx.cpp
+monodll_cocoa_checklst.o: $(srcdir)/src/cocoa/checklst.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/checklst.mm
-@COND_PLATFORM_UNIX_1@monodll_stackwalk.o: $(srcdir)/src/unix/stackwalk.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/stackwalk.cpp
+monodll_src_cocoa_choice.o: $(srcdir)/src/cocoa/choice.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/choice.mm
-@COND_PLATFORM_MACOSX_1@monodll_stackwalk.o: $(srcdir)/src/unix/stackwalk.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/stackwalk.cpp
+monodll_cocoa_clipbrd.o: $(srcdir)/src/cocoa/clipbrd.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/clipbrd.mm
-@COND_PLATFORM_WIN32_1@monodll_stackwalk.o: $(srcdir)/src/msw/stackwalk.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/stackwalk.cpp
+monodll_cocoa_colordlg.o: $(srcdir)/src/cocoa/colordlg.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/colordlg.mm
-@COND_PLATFORM_UNIX_1@monodll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
+monodll_cocoa_colour.o: $(srcdir)/src/cocoa/colour.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/colour.mm
-@COND_PLATFORM_MACOSX_1@monodll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
+monodll_cocoa_combobox.o: $(srcdir)/src/cocoa/combobox.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/combobox.mm
-@COND_PLATFORM_UNIX_1@monodll_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp
+monodll_cocoa_control.o: $(srcdir)/src/cocoa/control.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/control.mm
-@COND_PLATFORM_WIN32_1@monodll_mimetype.o: $(srcdir)/src/msw/mimetype.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mimetype.cpp
+monodll_cocoa_cursor.o: $(srcdir)/src/cocoa/cursor.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/cursor.mm
-@COND_PLATFORM_MACOSX_1@monodll_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/mimetype.cpp
+monodll_cocoa_data.o: $(srcdir)/src/cocoa/data.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/data.cpp
-@COND_PLATFORM_OS2_1@monodll_mimetype.o: $(srcdir)/src/os2/mimetype.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/mimetype.cpp
+monodll_cocoa_dataobj.o: $(srcdir)/src/cocoa/dataobj.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/dataobj.mm
-@COND_PLATFORM_MSDOS_1@monodll_mimetype.o: $(srcdir)/src/msdos/mimetype.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MSDOS_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msdos/mimetype.cpp
+monodll_cocoa_dc.o: $(srcdir)/src/cocoa/dc.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/dc.mm
-@COND_PLATFORM_UNIX_1@monodll_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
+monodll_cocoa_dcclient.o: $(srcdir)/src/cocoa/dcclient.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/dcclient.mm
-@COND_PLATFORM_OS2_1@monodll_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
+monodll_cocoa_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/dcmemory.mm
-@COND_PLATFORM_WIN32_1@monodll_thread.o: $(srcdir)/src/msw/thread.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/thread.cpp
+monodll_cocoa_dcscreen.o: $(srcdir)/src/cocoa/dcscreen.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/dcscreen.cpp
-@COND_PLATFORM_OS2_1@monodll_thread.o: $(srcdir)/src/os2/thread.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/thread.cpp
+monodll_src_cocoa_dialog.o: $(srcdir)/src/cocoa/dialog.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/dialog.mm
-@COND_PLATFORM_WIN32_1@monodll_timer.o: $(srcdir)/src/msw/timer.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/timer.cpp
+monodll_src_cocoa_dirdlg.o: $(srcdir)/src/cocoa/dirdlg.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/dirdlg.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_timer.o: $(srcdir)/src/gtk/timer.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/timer.cpp
+monodll_cocoa_display.o: $(srcdir)/src/cocoa/display.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/display.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_timer.o: $(srcdir)/src/gtk1/timer.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/timer.cpp
+monodll_cocoa_drawer.o: $(srcdir)/src/cocoa/drawer.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/drawer.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_timer.o: $(srcdir)/src/osx/core/timer.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
+monodll_src_cocoa_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/evtloop.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_timer.o: $(srcdir)/src/osx/core/timer.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
+monodll_src_cocoa_filedlg.o: $(srcdir)/src/cocoa/filedlg.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/filedlg.mm
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_timer.o: $(srcdir)/src/generic/timer.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
+monodll_cocoa_font.o: $(srcdir)/src/cocoa/font.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/font.mm
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_timer.o: $(srcdir)/src/generic/timer.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
+monodll_cocoa_fontdlg.o: $(srcdir)/src/cocoa/fontdlg.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/fontdlg.mm
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_timer.o: $(srcdir)/src/generic/timer.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
+monodll_cocoa_fontenum.o: $(srcdir)/src/cocoa/fontenum.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/fontenum.mm
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_timer.o: $(srcdir)/src/motif/timer.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/timer.cpp
+monodll_cocoa_fontutil.o: $(srcdir)/src/cocoa/fontutil.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/fontutil.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_timer.o: $(srcdir)/src/cocoa/timer.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/timer.mm
+monodll_cocoa_frame.o: $(srcdir)/src/cocoa/frame.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/frame.mm
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_timer.o: $(srcdir)/src/os2/timer.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/timer.cpp
+monodll_src_cocoa_gauge.o: $(srcdir)/src/cocoa/gauge.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/gauge.mm
-@COND_PLATFORM_WIN32_1@monodll_utils.o: $(srcdir)/src/msw/utils.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/utils.cpp
+monodll_cocoa_icon.o: $(srcdir)/src/cocoa/icon.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/icon.mm
-@COND_PLATFORM_OS2_1@monodll_utils.o: $(srcdir)/src/os2/utils.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/utils.cpp
+monodll_src_cocoa_listbox.o: $(srcdir)/src/cocoa/listbox.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/listbox.mm
-@COND_TOOLKIT_OSX_CARBON@monodll_utils.o: $(srcdir)/src/osx/carbon/utils.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/utils.cpp
+monodll_cocoa_main.o: $(srcdir)/src/cocoa/main.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/main.cpp
-@COND_TOOLKIT_OSX_COCOA@monodll_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm
+monodll_mbarman.o: $(srcdir)/src/cocoa/mbarman.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/mbarman.mm
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_utils.o: $(srcdir)/src/x11/utils.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/utils.cpp
+monodll_cocoa_mdi.o: $(srcdir)/src/cocoa/mdi.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/mdi.mm
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_utils.o: $(srcdir)/src/mgl/utils.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/utils.cpp
+monodll_src_cocoa_menu.o: $(srcdir)/src/cocoa/menu.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/menu.mm
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_utils.o: $(srcdir)/src/dfb/utils.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/utils.cpp
+monodll_src_cocoa_menuitem.o: $(srcdir)/src/cocoa/menuitem.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/menuitem.mm
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_utils.o: $(srcdir)/src/motif/utils.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/utils.cpp
+monodll_src_cocoa_msgdlg.o: $(srcdir)/src/cocoa/msgdlg.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/msgdlg.mm
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_utils.o: $(srcdir)/src/cocoa/utils.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/utils.mm
+monodll_src_cocoa_notebook.o: $(srcdir)/src/cocoa/notebook.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/notebook.mm
-@COND_PLATFORM_WIN32_1@monodll_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/utilsexc.cpp
+monodll_cocoa_pen.o: $(srcdir)/src/cocoa/pen.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/pen.mm
-@COND_PLATFORM_OS2_1@monodll_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/utilsexc.cpp
+monodll_cocoa_radiobox.o: $(srcdir)/src/cocoa/radiobox.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/radiobox.mm
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/utilsexc.mm
+monodll_src_cocoa_radiobut.o: $(srcdir)/src/cocoa/radiobut.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/radiobut.mm
-@COND_PLATFORM_WIN32_1@monodll_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp
+monodll_cocoa_region.o: $(srcdir)/src/cocoa/region.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/region.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/evtloop.cpp
+monodll_src_cocoa_scrolbar.o: $(srcdir)/src/cocoa/scrolbar.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/scrolbar.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_evtloop.o: $(srcdir)/src/gtk1/evtloop.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/evtloop.cpp
+monodll_cocoa_settings.o: $(srcdir)/src/cocoa/settings.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/settings.mm
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_evtloop.o: $(srcdir)/src/x11/evtloop.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/evtloop.cpp
+monodll_src_cocoa_slider.o: $(srcdir)/src/cocoa/slider.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/slider.mm
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/evtloop.cpp
+monodll_cocoa_sound.o: $(srcdir)/src/cocoa/sound.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/sound.mm
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_evtloop.o: $(srcdir)/src/dfb/evtloop.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/evtloop.cpp
+monodll_src_cocoa_spinbutt.o: $(srcdir)/src/cocoa/spinbutt.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/spinbutt.mm
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_evtloop.o: $(srcdir)/src/motif/evtloop.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/evtloop.cpp
+monodll_cocoa_statbmp.o: $(srcdir)/src/cocoa/statbmp.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/statbmp.mm
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_evtloop.o: $(srcdir)/src/osx/carbon/evtloop.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/evtloop.cpp
+monodll_src_cocoa_statbox.o: $(srcdir)/src/cocoa/statbox.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/statbox.mm
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_evtloop.o: $(srcdir)/src/osx/cocoa/evtloop.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/evtloop.mm
+monodll_statline2.o: $(srcdir)/src/cocoa/statline2.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/statline2.mm
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/evtloop.mm
+monodll_src_cocoa_stattext.o: $(srcdir)/src/cocoa/stattext.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/stattext.mm
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_evtloop.o: $(srcdir)/src/os2/evtloop.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/evtloop.cpp
+monodll_src_cocoa_textctrl.o: $(srcdir)/src/cocoa/textctrl.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/textctrl.mm
-@COND_PLATFORM_WIN32_1@monodll_main.o: $(srcdir)/src/msw/main.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/main.cpp
+monodll_cocoa_timer.o: $(srcdir)/src/cocoa/timer.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/timer.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_main.o: $(srcdir)/src/gtk1/main.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/main.cpp
+monodll_src_cocoa_toolbar.o: $(srcdir)/src/cocoa/toolbar.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/toolbar.mm
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_main.o: $(srcdir)/src/motif/main.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/main.cpp
+monodll_src_cocoa_tooltip.o: $(srcdir)/src/cocoa/tooltip.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/tooltip.mm
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_main.o: $(srcdir)/src/cocoa/main.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/main.cpp
+monodll_cocoa_toplevel.o: $(srcdir)/src/cocoa/toplevel.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/toplevel.mm
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_main.o: $(srcdir)/src/os2/main.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/main.cpp
+monodll_src_cocoa_utils.o: $(srcdir)/src/cocoa/utils.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/utils.mm
-@COND_PLATFORM_UNIX_1@monodll_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp
+monodll_cocoa_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/utilsexc.mm
-@COND_PLATFORM_MACOSX_1@monodll_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp
+monodll_src_cocoa_window.o: $(srcdir)/src/cocoa/window.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/window.mm
-@COND_PLATFORM_OS2_1@monodll_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp
+monodll_os2_accel.o: $(srcdir)/src/os2/accel.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/accel.cpp
-@COND_PLATFORM_WIN32_1@monodll_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gsocket.cpp
+monodll_os2_app.o: $(srcdir)/src/os2/app.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/app.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+monodll_os2_bitmap.o: $(srcdir)/src/os2/bitmap.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/bitmap.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+monodll_os2_bmpbuttn.o: $(srcdir)/src/os2/bmpbuttn.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/bmpbuttn.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+monodll_os2_brush.o: $(srcdir)/src/os2/brush.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/brush.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+monodll_os2_button.o: $(srcdir)/src/os2/button.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/button.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+monodll_os2_checkbox.o: $(srcdir)/src/os2/checkbox.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/checkbox.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+monodll_os2_checklst.o: $(srcdir)/src/os2/checklst.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/checklst.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+monodll_os2_choice.o: $(srcdir)/src/os2/choice.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/choice.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+monodll_os2_clipbrd.o: $(srcdir)/src/os2/clipbrd.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/clipbrd.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+monodll_os2_colour.o: $(srcdir)/src/os2/colour.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/colour.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+monodll_os2_combobox.o: $(srcdir)/src/os2/combobox.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/combobox.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_caret.o: $(srcdir)/src/msw/caret.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/caret.cpp
+monodll_os2_control.o: $(srcdir)/src/os2/control.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/control.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_caret.o: $(srcdir)/src/msw/caret.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/caret.cpp
+monodll_os2_cursor.o: $(srcdir)/src/os2/cursor.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/cursor.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+monodll_os2_data.o: $(srcdir)/src/os2/data.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/data.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+monodll_os2_dataobj.o: $(srcdir)/src/os2/dataobj.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dataobj.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+monodll_os2_dc.o: $(srcdir)/src/os2/dc.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dc.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+monodll_os2_dcclient.o: $(srcdir)/src/os2/dcclient.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dcclient.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+monodll_os2_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dcmemory.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+monodll_os2_dcprint.o: $(srcdir)/src/os2/dcprint.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dcprint.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+monodll_os2_dcscreen.o: $(srcdir)/src/os2/dcscreen.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dcscreen.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+monodll_os2_dialog.o: $(srcdir)/src/os2/dialog.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dialog.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
+monodll_os2_dnd.o: $(srcdir)/src/os2/dnd.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dnd.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
+monodll_os2_evtloop.o: $(srcdir)/src/os2/evtloop.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/evtloop.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
+monodll_os2_filedlg.o: $(srcdir)/src/os2/filedlg.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/filedlg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
+monodll_os2_font.o: $(srcdir)/src/os2/font.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/font.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
+monodll_os2_fontdlg.o: $(srcdir)/src/os2/fontdlg.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/fontdlg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
+monodll_os2_fontenum.o: $(srcdir)/src/os2/fontenum.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/fontenum.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
+monodll_os2_fontutil.o: $(srcdir)/src/os2/fontutil.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/fontutil.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
+monodll_os2_frame.o: $(srcdir)/src/os2/frame.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/frame.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_dialup.o: $(srcdir)/src/msw/dialup.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp
+monodll_os2_gauge.o: $(srcdir)/src/os2/gauge.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/gauge.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_dialup.o: $(srcdir)/src/msw/dialup.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp
+monodll_os2_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/gdiimage.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
+monodll_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/gsockpm.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
+monodll_os2_helpwin.o: $(srcdir)/src/os2/helpwin.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/helpwin.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
+monodll_os2_icon.o: $(srcdir)/src/os2/icon.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/icon.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
+monodll_os2_iniconf.o: $(srcdir)/src/os2/iniconf.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/iniconf.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp
+monodll_os2_listbox.o: $(srcdir)/src/os2/listbox.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/listbox.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp
+monodll_os2_main.o: $(srcdir)/src/os2/main.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/main.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
+monodll_os2_menu.o: $(srcdir)/src/os2/menu.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/menu.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
+monodll_os2_menuitem.o: $(srcdir)/src/os2/menuitem.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/menuitem.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_fontenum.o: $(srcdir)/src/mgl/fontenum.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/fontenum.cpp
+monodll_os2_metafile.o: $(srcdir)/src/os2/metafile.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/metafile.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_fontenum.o: $(srcdir)/src/dfb/fontenum.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/fontenum.cpp
+monodll_os2_minifram.o: $(srcdir)/src/os2/minifram.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/minifram.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontenum.o: $(srcdir)/src/cocoa/fontenum.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/fontenum.mm
+monodll_os2_msgdlg.o: $(srcdir)/src/os2/msgdlg.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/msgdlg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_fontenum.o: $(srcdir)/src/os2/fontenum.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/fontenum.cpp
+monodll_os2_nativdlg.o: $(srcdir)/src/os2/nativdlg.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/nativdlg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
+monodll_os2_notebook.o: $(srcdir)/src/os2/notebook.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/notebook.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
+monodll_os2_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/ownerdrw.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
+monodll_os2_palette.o: $(srcdir)/src/os2/palette.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/palette.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
+monodll_os2_pen.o: $(srcdir)/src/os2/pen.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/pen.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp
+monodll_os2_popupwin.o: $(srcdir)/src/os2/popupwin.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/popupwin.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp
+monodll_os2_print.o: $(srcdir)/src/os2/print.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/print.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
+monodll_os2_radiobox.o: $(srcdir)/src/os2/radiobox.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/radiobox.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
+monodll_os2_radiobut.o: $(srcdir)/src/os2/radiobut.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/radiobut.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_fontutil.o: $(srcdir)/src/mgl/fontutil.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/fontutil.cpp
+monodll_os2_region.o: $(srcdir)/src/os2/region.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/region.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontutil.o: $(srcdir)/src/cocoa/fontutil.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/fontutil.cpp
+monodll_os2_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/scrolbar.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_fontutil.o: $(srcdir)/src/os2/fontutil.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/fontutil.cpp
+monodll_os2_settings.o: $(srcdir)/src/os2/settings.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/settings.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
+monodll_os2_slider.o: $(srcdir)/src/os2/slider.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/slider.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
+monodll_os2_spinbutt.o: $(srcdir)/src/os2/spinbutt.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/spinbutt.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
+monodll_os2_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/spinctrl.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
+monodll_os2_statbmp.o: $(srcdir)/src/os2/statbmp.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/statbmp.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+monodll_os2_statbox.o: $(srcdir)/src/os2/statbox.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/statbox.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+monodll_os2_statline.o: $(srcdir)/src/os2/statline.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/statline.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+monodll_os2_stattext.o: $(srcdir)/src/os2/stattext.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/stattext.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+monodll_os2_tabctrl.o: $(srcdir)/src/os2/tabctrl.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/tabctrl.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+monodll_os2_textctrl.o: $(srcdir)/src/os2/textctrl.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/textctrl.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+monodll_os2_textentry.o: $(srcdir)/src/os2/textentry.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/textentry.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+monodll_os2_tglbtn.o: $(srcdir)/src/os2/tglbtn.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/tglbtn.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+monodll_os2_timer.o: $(srcdir)/src/os2/timer.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/timer.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+monodll_os2_toolbar.o: $(srcdir)/src/os2/toolbar.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/toolbar.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_icon.o: $(srcdir)/src/msw/icon.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
+monodll_os2_tooltip.o: $(srcdir)/src/os2/tooltip.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/tooltip.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_icon.o: $(srcdir)/src/msw/icon.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
+monodll_os2_toplevel.o: $(srcdir)/src/os2/toplevel.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/toplevel.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_icon.o: $(srcdir)/src/motif/icon.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/icon.cpp
+monodll_os2_utilsgui.o: $(srcdir)/src/os2/utilsgui.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/utilsgui.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
+monodll_os2_window.o: $(srcdir)/src/os2/window.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/window.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
+monodll_univ_bmpbuttn.o: $(srcdir)/src/univ/bmpbuttn.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/bmpbuttn.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_icon.o: $(srcdir)/src/cocoa/icon.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/icon.mm
+monodll_univ_button.o: $(srcdir)/src/univ/button.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/button.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_icon.o: $(srcdir)/src/os2/icon.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/icon.cpp
+monodll_univ_checkbox.o: $(srcdir)/src/univ/checkbox.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/checkbox.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
+monodll_univ_checklst.o: $(srcdir)/src/univ/checklst.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/checklst.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
+monodll_univ_choice.o: $(srcdir)/src/univ/choice.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/choice.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
+monodll_univ_combobox.o: $(srcdir)/src/univ/combobox.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/combobox.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_app.o: $(srcdir)/src/gtk/app.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/app.cpp
+monodll_univ_control.o: $(srcdir)/src/univ/control.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/control.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_app.o: $(srcdir)/src/gtk1/app.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/app.cpp
+monodll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/ctrlrend.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_app.o: $(srcdir)/src/msw/app.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/app.cpp
+monodll_univ_dialog.o: $(srcdir)/src/univ/dialog.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/dialog.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_app.o: $(srcdir)/src/msw/app.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/app.cpp
+monodll_framuniv.o: $(srcdir)/src/univ/framuniv.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/framuniv.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_app.o: $(srcdir)/src/x11/app.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/app.cpp
+monodll_univ_gauge.o: $(srcdir)/src/univ/gauge.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/gauge.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_app.o: $(srcdir)/src/mgl/app.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/app.cpp
+monodll_inpcons.o: $(srcdir)/src/univ/inpcons.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/inpcons.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_app.o: $(srcdir)/src/dfb/app.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/app.cpp
+monodll_inphand.o: $(srcdir)/src/univ/inphand.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/inphand.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_app.o: $(srcdir)/src/motif/app.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/app.cpp
+monodll_univ_listbox.o: $(srcdir)/src/univ/listbox.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/listbox.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_app.o: $(srcdir)/src/osx/carbon/app.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
+monodll_univ_menu.o: $(srcdir)/src/univ/menu.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/menu.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_app.o: $(srcdir)/src/osx/carbon/app.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
+monodll_univ_notebook.o: $(srcdir)/src/univ/notebook.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/notebook.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_app.o: $(srcdir)/src/cocoa/app.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/app.mm
+monodll_univ_radiobox.o: $(srcdir)/src/univ/radiobox.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/radiobox.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_app.o: $(srcdir)/src/os2/app.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/app.cpp
+monodll_univ_radiobut.o: $(srcdir)/src/univ/radiobut.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/radiobut.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.c $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.c
+monodll_scrarrow.o: $(srcdir)/src/univ/scrarrow.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/scrarrow.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/bitmap.cpp
+monodll_univ_scrolbar.o: $(srcdir)/src/univ/scrolbar.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/scrolbar.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_bitmap.o: $(srcdir)/src/gtk1/bitmap.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/bitmap.cpp
+monodll_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/scrthumb.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
+monodll_settingsuniv.o: $(srcdir)/src/univ/settingsuniv.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/settingsuniv.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
+monodll_univ_slider.o: $(srcdir)/src/univ/slider.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/slider.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp
+monodll_univ_spinbutt.o: $(srcdir)/src/univ/spinbutt.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/spinbutt.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp
+monodll_univ_statbmp.o: $(srcdir)/src/univ/statbmp.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/statbmp.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
+monodll_univ_statbox.o: $(srcdir)/src/univ/statbox.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/statbox.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
+monodll_univ_statline.o: $(srcdir)/src/univ/statline.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/statline.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_bitmap.o: $(srcdir)/src/mgl/bitmap.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/bitmap.cpp
+monodll_univ_stattext.o: $(srcdir)/src/univ/stattext.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/stattext.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_bitmap.o: $(srcdir)/src/dfb/bitmap.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/bitmap.cpp
+monodll_univ_statusbr.o: $(srcdir)/src/univ/statusbr.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/statusbr.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_bitmap.o: $(srcdir)/src/cocoa/bitmap.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/bitmap.mm
+monodll_stdrend.o: $(srcdir)/src/univ/stdrend.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/stdrend.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_bitmap.o: $(srcdir)/src/os2/bitmap.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/bitmap.cpp
+monodll_univ_textctrl.o: $(srcdir)/src/univ/textctrl.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/textctrl.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_brush.o: $(srcdir)/src/gtk/brush.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/brush.cpp
+monodll_univ_tglbtn.o: $(srcdir)/src/univ/tglbtn.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/tglbtn.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_brush.o: $(srcdir)/src/gtk1/brush.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/brush.cpp
+monodll_theme.o: $(srcdir)/src/univ/theme.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/theme.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_brush.o: $(srcdir)/src/x11/brush.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
+monodll_univ_toolbar.o: $(srcdir)/src/univ/toolbar.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/toolbar.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_brush.o: $(srcdir)/src/x11/brush.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
+monodll_topluniv.o: $(srcdir)/src/univ/topluniv.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/topluniv.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_brush.o: $(srcdir)/src/msw/brush.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/brush.cpp
+monodll_winuniv.o: $(srcdir)/src/univ/winuniv.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/winuniv.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_brush.o: $(srcdir)/src/msw/brush.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/brush.cpp
+monodll_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/themes/gtk.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_brush.o: $(srcdir)/src/osx/brush.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
+monodll_metal.o: $(srcdir)/src/univ/themes/metal.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/themes/metal.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_brush.o: $(srcdir)/src/osx/brush.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
+monodll_mono.o: $(srcdir)/src/univ/themes/mono.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/themes/mono.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_brush.o: $(srcdir)/src/mgl/brush.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/brush.cpp
+monodll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/themes/win32.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_brush.o: $(srcdir)/src/dfb/brush.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/brush.cpp
+monodll_gtk_aboutdlg.o: $(srcdir)/src/gtk/aboutdlg.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/aboutdlg.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_brush.o: $(srcdir)/src/cocoa/brush.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/brush.mm
+monodll_animate.o: $(srcdir)/src/gtk/animate.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/animate.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_brush.o: $(srcdir)/src/os2/brush.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/brush.cpp
+monodll_gtk_bmpcbox.o: $(srcdir)/src/gtk/bmpcbox.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/bmpcbox.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_clipbrd.o: $(srcdir)/src/gtk/clipbrd.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/clipbrd.cpp
+monodll_gtk_calctrl.o: $(srcdir)/src/gtk/calctrl.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/calctrl.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_clipbrd.o: $(srcdir)/src/gtk1/clipbrd.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/clipbrd.cpp
+monodll_gtk_dataview.o: $(srcdir)/src/gtk/dataview.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dataview.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/clipbrd.cpp
+monodll_hyperlink.o: $(srcdir)/src/gtk/hyperlink.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/hyperlink.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/clipbrd.cpp
+monodll_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/mediactrlcmn.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_clipbrd.o: $(srcdir)/src/x11/clipbrd.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/clipbrd.cpp
+monodll_carbon_mediactrl.o: $(srcdir)/src/osx/carbon/mediactrl.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/mediactrl.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_clipbrd.o: $(srcdir)/src/mgl/clipbrd.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/clipbrd.cpp
+monodll_cocoa_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/mediactrl.mm
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_clipbrd.o: $(srcdir)/src/motif/clipbrd.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/clipbrd.cpp
+monodll_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/helpbest.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
+monodll_helpctrl.o: $(srcdir)/src/html/helpctrl.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/helpctrl.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
+monodll_helpdata.o: $(srcdir)/src/html/helpdata.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/helpdata.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_clipbrd.o: $(srcdir)/src/cocoa/clipbrd.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/clipbrd.mm
+monodll_helpdlg.o: $(srcdir)/src/html/helpdlg.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/helpdlg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_clipbrd.o: $(srcdir)/src/os2/clipbrd.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/clipbrd.cpp
+monodll_helpfrm.o: $(srcdir)/src/html/helpfrm.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/helpfrm.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_colour.o: $(srcdir)/src/gtk/colour.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/colour.cpp
+monodll_helpwnd.o: $(srcdir)/src/html/helpwnd.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/helpwnd.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_colour.o: $(srcdir)/src/gtk1/colour.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/colour.cpp
+monodll_htmlcell.o: $(srcdir)/src/html/htmlcell.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/htmlcell.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_colour.o: $(srcdir)/src/msw/colour.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/colour.cpp
+monodll_htmlfilt.o: $(srcdir)/src/html/htmlfilt.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/htmlfilt.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_colour.o: $(srcdir)/src/msw/colour.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/colour.cpp
+monodll_htmlpars.o: $(srcdir)/src/html/htmlpars.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/htmlpars.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_colour.o: $(srcdir)/src/osx/core/colour.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
+monodll_htmltag.o: $(srcdir)/src/html/htmltag.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/htmltag.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_colour.o: $(srcdir)/src/osx/core/colour.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
+monodll_htmlwin.o: $(srcdir)/src/html/htmlwin.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/htmlwin.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_colour.o: $(srcdir)/src/x11/colour.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/colour.cpp
+monodll_htmprint.o: $(srcdir)/src/html/htmprint.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/htmprint.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_colour.o: $(srcdir)/src/generic/colour.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
+monodll_m_dflist.o: $(srcdir)/src/html/m_dflist.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_dflist.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_colour.o: $(srcdir)/src/generic/colour.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
+monodll_m_fonts.o: $(srcdir)/src/html/m_fonts.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_fonts.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_colour.o: $(srcdir)/src/motif/colour.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/colour.cpp
+monodll_m_hline.o: $(srcdir)/src/html/m_hline.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_hline.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_colour.o: $(srcdir)/src/cocoa/colour.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/colour.mm
+monodll_m_image.o: $(srcdir)/src/html/m_image.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_image.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_colour.o: $(srcdir)/src/os2/colour.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/colour.cpp
+monodll_m_layout.o: $(srcdir)/src/html/m_layout.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_layout.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_cursor.o: $(srcdir)/src/gtk/cursor.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/cursor.cpp
+monodll_m_links.o: $(srcdir)/src/html/m_links.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_links.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_cursor.o: $(srcdir)/src/gtk1/cursor.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/cursor.cpp
+monodll_m_list.o: $(srcdir)/src/html/m_list.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_list.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_cursor.o: $(srcdir)/src/msw/cursor.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/cursor.cpp
+monodll_m_pre.o: $(srcdir)/src/html/m_pre.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_pre.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_cursor.o: $(srcdir)/src/msw/cursor.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/cursor.cpp
+monodll_m_style.o: $(srcdir)/src/html/m_style.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_style.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_cursor.o: $(srcdir)/src/x11/cursor.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/cursor.cpp
+monodll_m_tables.o: $(srcdir)/src/html/m_tables.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_tables.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_cursor.o: $(srcdir)/src/mgl/cursor.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/cursor.cpp
+monodll_winpars.o: $(srcdir)/src/html/winpars.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/winpars.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_cursor.o: $(srcdir)/src/dfb/cursor.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/cursor.cpp
+monodll_htmllbox.o: $(srcdir)/src/generic/htmllbox.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/htmllbox.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_cursor.o: $(srcdir)/src/motif/cursor.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/cursor.cpp
+monodll_debugrpt.o: $(srcdir)/src/common/debugrpt.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/debugrpt.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
+monodll_dbgrptg.o: $(srcdir)/src/generic/dbgrptg.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dbgrptg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
+monodll_xh_animatctrl.o: $(srcdir)/src/xrc/xh_animatctrl.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_animatctrl.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_cursor.o: $(srcdir)/src/cocoa/cursor.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/cursor.mm
+monodll_xh_bmp.o: $(srcdir)/src/xrc/xh_bmp.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_bmp.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_cursor.o: $(srcdir)/src/os2/cursor.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/cursor.cpp
+monodll_xh_bmpcbox.o: $(srcdir)/src/xrc/xh_bmpcbox.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_bmpcbox.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_dataobj.o: $(srcdir)/src/gtk/dataobj.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dataobj.cpp
+monodll_xh_bmpbt.o: $(srcdir)/src/xrc/xh_bmpbt.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_bmpbt.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_dataobj.o: $(srcdir)/src/gtk1/dataobj.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/dataobj.cpp
+monodll_xh_bttn.o: $(srcdir)/src/xrc/xh_bttn.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_bttn.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/dataobj.cpp
+monodll_xh_cald.o: $(srcdir)/src/xrc/xh_cald.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_cald.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/dataobj.cpp
+monodll_xh_chckb.o: $(srcdir)/src/xrc/xh_chckb.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_chckb.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_dataobj.o: $(srcdir)/src/x11/dataobj.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/dataobj.cpp
+monodll_xh_chckl.o: $(srcdir)/src/xrc/xh_chckl.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_chckl.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_dataobj.o: $(srcdir)/src/motif/dataobj.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/dataobj.cpp
+monodll_xh_choic.o: $(srcdir)/src/xrc/xh_choic.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_choic.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
+monodll_xh_choicbk.o: $(srcdir)/src/xrc/xh_choicbk.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_choicbk.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
+monodll_xh_clrpicker.o: $(srcdir)/src/xrc/xh_clrpicker.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_clrpicker.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_dataobj.o: $(srcdir)/src/cocoa/dataobj.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/dataobj.mm
+monodll_xh_collpane.o: $(srcdir)/src/xrc/xh_collpane.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_collpane.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dataobj.o: $(srcdir)/src/os2/dataobj.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dataobj.cpp
+monodll_xh_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_combo.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_dc.o: $(srcdir)/src/gtk/dc.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dc.cpp
+monodll_xh_datectrl.o: $(srcdir)/src/xrc/xh_datectrl.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_datectrl.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_dc.o: $(srcdir)/src/gtk1/dc.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/dc.cpp
+monodll_xh_dirpicker.o: $(srcdir)/src/xrc/xh_dirpicker.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_dirpicker.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_dc.o: $(srcdir)/src/msw/dc.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dc.cpp
+monodll_xh_dlg.o: $(srcdir)/src/xrc/xh_dlg.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_dlg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_dc.o: $(srcdir)/src/msw/dc.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dc.cpp
+monodll_xh_frame.o: $(srcdir)/src/xrc/xh_frame.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_frame.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_dc.o: $(srcdir)/src/x11/dc.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/dc.cpp
+monodll_xh_mdi.o: $(srcdir)/src/xrc/xh_mdi.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_mdi.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_dc.o: $(srcdir)/src/mgl/dc.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/dc.cpp
+monodll_xh_filepicker.o: $(srcdir)/src/xrc/xh_filepicker.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_filepicker.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dc.o: $(srcdir)/src/dfb/dc.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/dc.cpp
+monodll_xh_fontpicker.o: $(srcdir)/src/xrc/xh_fontpicker.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_fontpicker.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_dc.o: $(srcdir)/src/motif/dc.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/dc.cpp
+monodll_xh_gauge.o: $(srcdir)/src/xrc/xh_gauge.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_gauge.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_dc.o: $(srcdir)/src/cocoa/dc.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/dc.mm
+monodll_xh_gdctl.o: $(srcdir)/src/xrc/xh_gdctl.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_gdctl.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dc.o: $(srcdir)/src/os2/dc.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dc.cpp
+monodll_xh_grid.o: $(srcdir)/src/xrc/xh_grid.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_grid.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_dcclient.o: $(srcdir)/src/gtk/dcclient.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dcclient.cpp
+monodll_xh_html.o: $(srcdir)/src/xrc/xh_html.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_html.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_dcclient.o: $(srcdir)/src/gtk1/dcclient.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/dcclient.cpp
+monodll_xh_hyperlink.o: $(srcdir)/src/xrc/xh_hyperlink.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_hyperlink.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dcclient.cpp
+monodll_xh_listb.o: $(srcdir)/src/xrc/xh_listb.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_listb.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dcclient.cpp
+monodll_xh_listbk.o: $(srcdir)/src/xrc/xh_listbk.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_listbk.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_dcclient.o: $(srcdir)/src/x11/dcclient.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/dcclient.cpp
+monodll_xh_listc.o: $(srcdir)/src/xrc/xh_listc.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_listc.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/dcclient.cpp
+monodll_xh_menu.o: $(srcdir)/src/xrc/xh_menu.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_menu.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dcclient.o: $(srcdir)/src/dfb/dcclient.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/dcclient.cpp
+monodll_xh_notbk.o: $(srcdir)/src/xrc/xh_notbk.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_notbk.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_dcclient.o: $(srcdir)/src/motif/dcclient.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/dcclient.cpp
+monodll_xh_odcombo.o: $(srcdir)/src/xrc/xh_odcombo.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_odcombo.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
+monodll_xh_panel.o: $(srcdir)/src/xrc/xh_panel.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_panel.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
+monodll_xh_propdlg.o: $(srcdir)/src/xrc/xh_propdlg.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_propdlg.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_dcclient.o: $(srcdir)/src/cocoa/dcclient.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/dcclient.mm
+monodll_xh_radbt.o: $(srcdir)/src/xrc/xh_radbt.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_radbt.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dcclient.o: $(srcdir)/src/os2/dcclient.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dcclient.cpp
+monodll_xh_radbx.o: $(srcdir)/src/xrc/xh_radbx.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_radbx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_dcmemory.o: $(srcdir)/src/gtk/dcmemory.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dcmemory.cpp
+monodll_xh_scrol.o: $(srcdir)/src/xrc/xh_scrol.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_scrol.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_dcmemory.o: $(srcdir)/src/gtk1/dcmemory.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/dcmemory.cpp
+monodll_xh_scwin.o: $(srcdir)/src/xrc/xh_scwin.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_scwin.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp
+monodll_xh_htmllbox.o: $(srcdir)/src/xrc/xh_htmllbox.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_htmllbox.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp
+monodll_xh_sizer.o: $(srcdir)/src/xrc/xh_sizer.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_sizer.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
+monodll_xh_slidr.o: $(srcdir)/src/xrc/xh_slidr.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_slidr.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
+monodll_xh_spin.o: $(srcdir)/src/xrc/xh_spin.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_spin.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_dcmemory.o: $(srcdir)/src/x11/dcmemory.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/dcmemory.cpp
+monodll_xh_split.o: $(srcdir)/src/xrc/xh_split.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_split.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_dcmemory.o: $(srcdir)/src/mgl/dcmemory.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/dcmemory.cpp
+monodll_xh_srchctrl.o: $(srcdir)/src/xrc/xh_srchctrl.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_srchctrl.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dcmemory.o: $(srcdir)/src/dfb/dcmemory.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/dcmemory.cpp
+monodll_xh_statbar.o: $(srcdir)/src/xrc/xh_statbar.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_statbar.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_dcmemory.o: $(srcdir)/src/motif/dcmemory.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/dcmemory.cpp
+monodll_xh_stbmp.o: $(srcdir)/src/xrc/xh_stbmp.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_stbmp.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/dcmemory.mm
+monodll_xh_stbox.o: $(srcdir)/src/xrc/xh_stbox.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_stbox.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dcmemory.cpp
+monodll_xh_stlin.o: $(srcdir)/src/xrc/xh_stlin.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_stlin.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_dcscreen.o: $(srcdir)/src/gtk/dcscreen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dcscreen.cpp
+monodll_xh_sttxt.o: $(srcdir)/src/xrc/xh_sttxt.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_sttxt.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_dcscreen.o: $(srcdir)/src/gtk1/dcscreen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/dcscreen.cpp
+monodll_xh_text.o: $(srcdir)/src/xrc/xh_text.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_text.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_dcscreen.o: $(srcdir)/src/msw/dcscreen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dcscreen.cpp
+monodll_xh_tglbtn.o: $(srcdir)/src/xrc/xh_tglbtn.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_tglbtn.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_dcscreen.o: $(srcdir)/src/msw/dcscreen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dcscreen.cpp
+monodll_xh_toolb.o: $(srcdir)/src/xrc/xh_toolb.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_toolb.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_dcscreen.o: $(srcdir)/src/x11/dcscreen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/dcscreen.cpp
+monodll_xh_tree.o: $(srcdir)/src/xrc/xh_tree.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_tree.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_dcscreen.o: $(srcdir)/src/mgl/dcscreen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/dcscreen.cpp
+monodll_xh_treebk.o: $(srcdir)/src/xrc/xh_treebk.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_treebk.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dcscreen.o: $(srcdir)/src/dfb/dcscreen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/dcscreen.cpp
+monodll_xh_unkwn.o: $(srcdir)/src/xrc/xh_unkwn.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_unkwn.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_dcscreen.o: $(srcdir)/src/motif/dcscreen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/dcscreen.cpp
+monodll_xh_wizrd.o: $(srcdir)/src/xrc/xh_wizrd.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_wizrd.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
+monodll_xmlres.o: $(srcdir)/src/xrc/xmlres.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xmlres.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
+monodll_xmladv.o: $(srcdir)/src/xrc/xmladv.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xmladv.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_dcscreen.o: $(srcdir)/src/cocoa/dcscreen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/dcscreen.cpp
+monodll_xmlrsall.o: $(srcdir)/src/xrc/xmlrsall.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xmlrsall.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dcscreen.o: $(srcdir)/src/os2/dcscreen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dcscreen.cpp
+monodll_framemanager.o: $(srcdir)/src/aui/framemanager.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/framemanager.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_dnd.o: $(srcdir)/src/gtk/dnd.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dnd.cpp
+monodll_dockart.o: $(srcdir)/src/aui/dockart.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/dockart.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_dnd.o: $(srcdir)/src/gtk1/dnd.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/dnd.cpp
+monodll_floatpane.o: $(srcdir)/src/aui/floatpane.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/floatpane.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_dnd.o: $(srcdir)/src/osx/carbon/dnd.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dnd.cpp
+monodll_auibook.o: $(srcdir)/src/aui/auibook.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/auibook.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_dnd.o: $(srcdir)/src/osx/carbon/dnd.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dnd.cpp
+monodll_auibar.o: $(srcdir)/src/aui/auibar.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/auibar.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dnd.o: $(srcdir)/src/os2/dnd.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dnd.cpp
+monodll_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/tabmdi.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_filectrl.o: $(srcdir)/src/gtk/filectrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/filectrl.cpp
+monodll_advprops.o: $(srcdir)/src/propgrid/advprops.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/propgrid/advprops.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_font.o: $(srcdir)/src/gtk/font.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/font.cpp
+monodll_editors.o: $(srcdir)/src/propgrid/editors.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/propgrid/editors.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_font.o: $(srcdir)/src/gtk1/font.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/font.cpp
+monodll_manager.o: $(srcdir)/src/propgrid/manager.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/propgrid/manager.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_font.o: $(srcdir)/src/msw/font.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/font.cpp
+monodll_property.o: $(srcdir)/src/propgrid/property.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/propgrid/property.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_font.o: $(srcdir)/src/msw/font.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/font.cpp
+monodll_propgrid.o: $(srcdir)/src/propgrid/propgrid.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/propgrid/propgrid.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_font.o: $(srcdir)/src/x11/font.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/font.cpp
+monodll_propgridiface.o: $(srcdir)/src/propgrid/propgridiface.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/propgrid/propgridiface.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_font.o: $(srcdir)/src/mgl/font.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/font.cpp
+monodll_propgridpagestate.o: $(srcdir)/src/propgrid/propgridpagestate.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/propgrid/propgridpagestate.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_font.o: $(srcdir)/src/dfb/font.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/font.cpp
+monodll_props.o: $(srcdir)/src/propgrid/props.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/propgrid/props.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_font.o: $(srcdir)/src/motif/font.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/font.cpp
+monodll_richtextctrl.o: $(srcdir)/src/richtext/richtextctrl.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextctrl.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_font.o: $(srcdir)/src/osx/carbon/font.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
+monodll_richtextbuffer.o: $(srcdir)/src/richtext/richtextbuffer.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextbuffer.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_font.o: $(srcdir)/src/osx/carbon/font.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
+monodll_richtextstyles.o: $(srcdir)/src/richtext/richtextstyles.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextstyles.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_font.o: $(srcdir)/src/cocoa/font.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/font.mm
+monodll_richtextxml.o: $(srcdir)/src/richtext/richtextxml.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextxml.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_font.o: $(srcdir)/src/os2/font.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/font.cpp
+monodll_richtexthtml.o: $(srcdir)/src/richtext/richtexthtml.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtexthtml.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/gsockgtk.cpp
+monodll_richtextformatdlg.o: $(srcdir)/src/richtext/richtextformatdlg.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextformatdlg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gsockgtk.o: $(srcdir)/src/gtk1/gsockgtk.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/gsockgtk.cpp
+monodll_richtextsymboldlg.o: $(srcdir)/src/richtext/richtextsymboldlg.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextsymboldlg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_minifram.o: $(srcdir)/src/gtk/minifram.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/minifram.cpp
+monodll_richtextstyledlg.o: $(srcdir)/src/richtext/richtextstyledlg.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextstyledlg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_minifram.o: $(srcdir)/src/gtk1/minifram.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/minifram.cpp
+monodll_richtextprint.o: $(srcdir)/src/richtext/richtextprint.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextprint.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_minifram.o: $(srcdir)/src/msw/minifram.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
+monodll_stc.o: $(srcdir)/src/stc/stc.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/stc/stc.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_minifram.o: $(srcdir)/src/msw/minifram.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
+monodll_PlatWX.o: $(srcdir)/src/stc/PlatWX.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/stc/PlatWX.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_minifram.o: $(srcdir)/src/osx/minifram.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
+monodll_ScintillaWX.o: $(srcdir)/src/stc/ScintillaWX.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/stc/ScintillaWX.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_minifram.o: $(srcdir)/src/osx/minifram.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
+monodll_xml.o: $(srcdir)/src/xml/xml.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xml/xml.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_minifram.o: $(srcdir)/src/x11/minifram.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/minifram.cpp
+monodll_xtixml.o: $(srcdir)/src/common/xtixml.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/xtixml.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_minifram.o: $(srcdir)/src/motif/minifram.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/minifram.cpp
+monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound_sdl.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_minifram.o: $(srcdir)/src/os2/minifram.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/minifram.cpp
+@COND_PLATFORM_UNIX_1@monodll_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_pen.o: $(srcdir)/src/gtk/pen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/pen.cpp
+@COND_PLATFORM_MACOSX_1@monodll_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_pen.o: $(srcdir)/src/gtk1/pen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/pen.cpp
+@COND_PLATFORM_OS2_1@monodll_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_pen.o: $(srcdir)/src/x11/pen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
+@COND_PLATFORM_UNIX_1@monodll_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_pen.o: $(srcdir)/src/x11/pen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
+@COND_PLATFORM_MACOSX_1@monodll_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_pen.o: $(srcdir)/src/msw/pen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/pen.cpp
+@COND_PLATFORM_OS2_1@monodll_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_pen.o: $(srcdir)/src/msw/pen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/pen.cpp
+@COND_PLATFORM_UNIX_1@monodll_epolldispatcher.o: $(srcdir)/src/unix/epolldispatcher.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/epolldispatcher.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_pen.o: $(srcdir)/src/osx/pen.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
+@COND_PLATFORM_MACOSX_1@monodll_epolldispatcher.o: $(srcdir)/src/unix/epolldispatcher.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/epolldispatcher.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_pen.o: $(srcdir)/src/osx/pen.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
+@COND_PLATFORM_UNIX_1@monodll_appunix.o: $(srcdir)/src/unix/appunix.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_pen.o: $(srcdir)/src/mgl/pen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/pen.cpp
+@COND_PLATFORM_MACOSX_1@monodll_appunix.o: $(srcdir)/src/unix/appunix.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_pen.o: $(srcdir)/src/dfb/pen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/pen.cpp
+@COND_PLATFORM_OS2_1@monodll_appunix.o: $(srcdir)/src/unix/appunix.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_pen.o: $(srcdir)/src/cocoa/pen.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/pen.mm
+@COND_PLATFORM_UNIX_1@monodll_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_pen.o: $(srcdir)/src/os2/pen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/pen.cpp
+@COND_PLATFORM_MACOSX_1@monodll_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_popupwin.o: $(srcdir)/src/gtk/popupwin.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/popupwin.cpp
+@COND_PLATFORM_OS2_1@monodll_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_popupwin.o: $(srcdir)/src/gtk1/popupwin.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/popupwin.cpp
+@COND_PLATFORM_UNIX_1@monodll_unix_dir.o: $(srcdir)/src/unix/dir.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dir.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_popupwin.o: $(srcdir)/src/msw/popupwin.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/popupwin.cpp
+@COND_PLATFORM_MACOSX_1@monodll_unix_dir.o: $(srcdir)/src/unix/dir.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dir.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_popupwin.o: $(srcdir)/src/msw/popupwin.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/popupwin.cpp
+@COND_PLATFORM_UNIX_1@monodll_dlunix.o: $(srcdir)/src/unix/dlunix.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dlunix.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_popupwin.o: $(srcdir)/src/x11/popupwin.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/popupwin.cpp
+@COND_PLATFORM_MACOSX_1@monodll_dlunix.o: $(srcdir)/src/unix/dlunix.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dlunix.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_popupwin.o: $(srcdir)/src/motif/popupwin.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/popupwin.cpp
+@COND_PLATFORM_UNIX_1@monodll_unix_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
+@COND_PLATFORM_MACOSX_1@monodll_unix_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
+@COND_PLATFORM_UNIX_1@monodll_unix_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/stdpaths.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_popupwin.o: $(srcdir)/src/os2/popupwin.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/popupwin.cpp
+@COND_PLATFORM_MACOSX_1@monodll_unix_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/stdpaths.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_private.o: $(srcdir)/src/gtk/private.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/private.cpp
+@COND_PLATFORM_UNIX_1@monodll_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_region.o: $(srcdir)/src/gtk/region.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/region.cpp
+@COND_PLATFORM_MACOSX_1@monodll_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_region.o: $(srcdir)/src/gtk1/region.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/region.cpp
+@COND_PLATFORM_OS2_1@monodll_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_region.o: $(srcdir)/src/x11/region.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/region.cpp
+@COND_PLATFORM_UNIX_1@monodll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/threadpsx.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_region.o: $(srcdir)/src/x11/region.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/region.cpp
+@COND_PLATFORM_MACOSX_1@monodll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/threadpsx.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_region.o: $(srcdir)/src/msw/region.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/region.cpp
+@COND_PLATFORM_UNIX_1@monodll_unix_stackwalk.o: $(srcdir)/src/unix/stackwalk.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/stackwalk.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_region.o: $(srcdir)/src/msw/region.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/region.cpp
+@COND_PLATFORM_MACOSX_1@monodll_unix_stackwalk.o: $(srcdir)/src/unix/stackwalk.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/stackwalk.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_region.o: $(srcdir)/src/mgl/region.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/region.cpp
+@COND_PLATFORM_UNIX_1@monodll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_region.o: $(srcdir)/src/dfb/region.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/region.cpp
+@COND_PLATFORM_MACOSX_1@monodll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_region.o: $(srcdir)/src/osx/carbon/region.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/region.cpp
+@COND_PLATFORM_UNIX_1@monodll_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_region.o: $(srcdir)/src/cocoa/region.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/region.mm
+@COND_PLATFORM_OS2_1@monodll_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_region.o: $(srcdir)/src/os2/region.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/region.cpp
+@COND_PLATFORM_UNIX_1@monodll_unix_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_renderer.o: $(srcdir)/src/gtk/renderer.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/renderer.cpp
+@COND_PLATFORM_MACOSX_1@monodll_unix_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_renderer.o: $(srcdir)/src/gtk1/renderer.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/renderer.cpp
+@COND_PLATFORM_OS2_1@monodll_unix_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_renderer.o: $(srcdir)/src/msw/renderer.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/renderer.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_renderer.o: $(srcdir)/src/msw/renderer.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/renderer.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_settings.o: $(srcdir)/src/gtk/settings.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_settings.o: $(srcdir)/src/gtk1/settings.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_settings.o: $(srcdir)/src/msw/settings.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/settings.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_settings.o: $(srcdir)/src/msw/settings.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/settings.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_settings.o: $(srcdir)/src/x11/settings.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/settings.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_settings.o: $(srcdir)/src/mgl/settings.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/settings.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_settings.o: $(srcdir)/src/dfb/settings.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/settings.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_settings.o: $(srcdir)/src/motif/settings.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/settings.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_settings.o: $(srcdir)/src/cocoa/settings.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/settings.mm
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_settings.o: $(srcdir)/src/os2/settings.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/settings.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_tooltip.o: $(srcdir)/src/gtk/tooltip.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/tooltip.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_tooltip.o: $(srcdir)/src/gtk1/tooltip.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/tooltip.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_tooltip.o: $(srcdir)/src/osx/carbon/tooltip.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/tooltip.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_tooltip.o: $(srcdir)/src/osx/cocoa/tooltip.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/tooltip.mm
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_tooltip.o: $(srcdir)/src/cocoa/tooltip.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/tooltip.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_tooltip.o: $(srcdir)/src/os2/tooltip.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/tooltip.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_toplevel.o: $(srcdir)/src/gtk/toplevel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/toplevel.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_toplevel.o: $(srcdir)/src/gtk1/toplevel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/toplevel.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_toplevel.o: $(srcdir)/src/x11/toplevel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/toplevel.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_toplevel.o: $(srcdir)/src/mgl/toplevel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/toplevel.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_toplevel.o: $(srcdir)/src/dfb/toplevel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/toplevel.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_toplevel.o: $(srcdir)/src/motif/toplevel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/toplevel.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_toplevel.o: $(srcdir)/src/cocoa/toplevel.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/toplevel.mm
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_toplevel.o: $(srcdir)/src/os2/toplevel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/toplevel.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_utilsgtk.o: $(srcdir)/src/gtk/utilsgtk.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/utilsgtk.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_utilsgtk.o: $(srcdir)/src/gtk1/utilsgtk.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/utilsgtk.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_win_gtk.o: $(srcdir)/src/gtk/win_gtk.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/win_gtk.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_win_gtk.o: $(srcdir)/src/gtk1/win_gtk.c $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/gtk1/win_gtk.c
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_window.o: $(srcdir)/src/gtk/window.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/window.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_window.o: $(srcdir)/src/gtk1/window.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/window.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_window.o: $(srcdir)/src/msw/window.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/window.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_window.o: $(srcdir)/src/msw/window.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/window.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_window.o: $(srcdir)/src/x11/window.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/window.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_window.o: $(srcdir)/src/mgl/window.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/window.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_window.o: $(srcdir)/src/dfb/window.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/window.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_window.o: $(srcdir)/src/motif/window.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/window.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_window.o: $(srcdir)/src/osx/carbon/window.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/window.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_app.o: $(srcdir)/src/gtk/app.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/app.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_window.o: $(srcdir)/src/osx/cocoa/window.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/window.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.c $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.c
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_window.o: $(srcdir)/src/cocoa/window.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/window.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/bitmap.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_window.o: $(srcdir)/src/os2/window.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/window.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_brush.o: $(srcdir)/src/gtk/brush.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/brush.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_data.o: $(srcdir)/src/gtk1/data.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/data.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_clipbrd.o: $(srcdir)/src/gtk/clipbrd.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/clipbrd.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_data.o: $(srcdir)/src/msw/data.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/data.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_colour.o: $(srcdir)/src/gtk/colour.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/colour.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_data.o: $(srcdir)/src/msw/data.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/data.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_cursor.o: $(srcdir)/src/gtk/cursor.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/cursor.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_data.o: $(srcdir)/src/x11/data.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/data.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_dataobj.o: $(srcdir)/src/gtk/dataobj.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dataobj.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_data.o: $(srcdir)/src/mgl/data.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/data.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_dc.o: $(srcdir)/src/gtk/dc.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dc.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_data.o: $(srcdir)/src/motif/data.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/data.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_dcclient.o: $(srcdir)/src/gtk/dcclient.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dcclient.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_data.o: $(srcdir)/src/cocoa/data.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/data.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_dcmemory.o: $(srcdir)/src/gtk/dcmemory.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dcmemory.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_data.o: $(srcdir)/src/os2/data.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/data.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_dcscreen.o: $(srcdir)/src/gtk/dcscreen.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dcscreen.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_palette.o: $(srcdir)/src/x11/palette.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_dnd.o: $(srcdir)/src/gtk/dnd.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dnd.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_palette.o: $(srcdir)/src/x11/palette.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/evtloop.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_palette.o: $(srcdir)/src/msw/palette.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/palette.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_filectrl.o: $(srcdir)/src/gtk/filectrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/filectrl.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_palette.o: $(srcdir)/src/msw/palette.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/palette.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_font.o: $(srcdir)/src/gtk/font.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/font.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_palette.o: $(srcdir)/src/osx/palette.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/gsockgtk.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_palette.o: $(srcdir)/src/osx/palette.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_minifram.o: $(srcdir)/src/gtk/minifram.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/minifram.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_palette.o: $(srcdir)/src/mgl/palette.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/palette.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_pen.o: $(srcdir)/src/gtk/pen.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/pen.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_palette.o: $(srcdir)/src/os2/palette.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/palette.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_popupwin.o: $(srcdir)/src/gtk/popupwin.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/popupwin.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_private.o: $(srcdir)/src/gtk/private.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/private.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_region.o: $(srcdir)/src/gtk/region.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/region.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_dcprint.o: $(srcdir)/src/msw/dcprint.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dcprint.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_renderer.o: $(srcdir)/src/gtk/renderer.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/renderer.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_dcprint.o: $(srcdir)/src/msw/dcprint.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dcprint.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_settings.o: $(srcdir)/src/gtk/settings.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/settings.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_timer.o: $(srcdir)/src/gtk/timer.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/timer.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_tooltip.o: $(srcdir)/src/gtk/tooltip.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/tooltip.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dcprint.o: $(srcdir)/src/os2/dcprint.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dcprint.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_toplevel.o: $(srcdir)/src/gtk/toplevel.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/toplevel.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_dib.o: $(srcdir)/src/msw/dib.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dib.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_utilsgtk.o: $(srcdir)/src/gtk/utilsgtk.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/utilsgtk.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_dib.o: $(srcdir)/src/msw/dib.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dib.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_win_gtk.o: $(srcdir)/src/gtk/win_gtk.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/win_gtk.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_display.o: $(srcdir)/src/msw/display.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/display.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_window.o: $(srcdir)/src/gtk/window.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/window.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_display.o: $(srcdir)/src/msw/display.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/display.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_app.o: $(srcdir)/src/gtk1/app.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/app.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_display.o: $(srcdir)/src/osx/core/display.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_bitmap.o: $(srcdir)/src/gtk1/bitmap.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/bitmap.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_display.o: $(srcdir)/src/osx/core/display.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_brush.o: $(srcdir)/src/gtk1/brush.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/brush.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_display.o: $(srcdir)/src/cocoa/display.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/display.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_clipbrd.o: $(srcdir)/src/gtk1/clipbrd.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/clipbrd.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_colour.o: $(srcdir)/src/gtk1/colour.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/colour.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_cursor.o: $(srcdir)/src/gtk1/cursor.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/cursor.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_data.o: $(srcdir)/src/gtk1/data.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/data.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_dataobj.o: $(srcdir)/src/gtk1/dataobj.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/dataobj.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/gdiimage.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_dc.o: $(srcdir)/src/gtk1/dc.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/dc.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_dcclient.o: $(srcdir)/src/gtk1/dcclient.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/dcclient.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_dcmemory.o: $(srcdir)/src/gtk1/dcmemory.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/dcmemory.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_dcscreen.o: $(srcdir)/src/gtk1/dcscreen.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/dcscreen.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_dnd.o: $(srcdir)/src/gtk1/dnd.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/dnd.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_evtloop.o: $(srcdir)/src/gtk1/evtloop.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/evtloop.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_font.o: $(srcdir)/src/gtk1/font.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/font.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_graphics.o: $(srcdir)/src/msw/graphics.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_gsockgtk.o: $(srcdir)/src/gtk1/gsockgtk.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/gsockgtk.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_graphics.o: $(srcdir)/src/msw/graphics.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_main.o: $(srcdir)/src/gtk1/main.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/main.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_minifram.o: $(srcdir)/src/gtk1/minifram.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/minifram.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_pen.o: $(srcdir)/src/gtk1/pen.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/pen.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/dropsrc.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_popupwin.o: $(srcdir)/src/gtk1/popupwin.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/popupwin.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_region.o: $(srcdir)/src/gtk1/region.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/region.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_renderer.o: $(srcdir)/src/gtk1/renderer.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/renderer.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_settings.o: $(srcdir)/src/gtk1/settings.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/settings.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_timer.o: $(srcdir)/src/gtk1/timer.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/timer.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_tooltip.o: $(srcdir)/src/gtk1/tooltip.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/tooltip.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_toplevel.o: $(srcdir)/src/gtk1/toplevel.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/toplevel.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_utilsgtk.o: $(srcdir)/src/gtk1/utilsgtk.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/utilsgtk.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_win_gtk.o: $(srcdir)/src/gtk1/win_gtk.c $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/gtk1/win_gtk.c
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_window.o: $(srcdir)/src/gtk1/window.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/window.cpp
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_x11_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_x11_brush.o: $(srcdir)/src/x11/brush.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_brush.o: $(srcdir)/src/x11/brush.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_x11_palette.o: $(srcdir)/src/x11/palette.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_palette.o: $(srcdir)/src/x11/palette.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_x11_pen.o: $(srcdir)/src/x11/pen.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_pen.o: $(srcdir)/src/x11/pen.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_x11_region.o: $(srcdir)/src/x11/region.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/region.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_region.o: $(srcdir)/src/x11/region.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/region.cpp
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_app.o: $(srcdir)/src/msw/app.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/app.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_app.o: $(srcdir)/src/msw/app.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/app.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_brush.o: $(srcdir)/src/msw/brush.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/brush.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_brush.o: $(srcdir)/src/msw/brush.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/brush.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_caret.o: $(srcdir)/src/msw/caret.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/caret.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_caret.o: $(srcdir)/src/msw/caret.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/caret.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/clipbrd.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/clipbrd.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_colour.o: $(srcdir)/src/msw/colour.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/colour.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_colour.o: $(srcdir)/src/msw/colour.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/colour.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_cursor.o: $(srcdir)/src/msw/cursor.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/cursor.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_cursor.o: $(srcdir)/src/msw/cursor.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/cursor.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_data.o: $(srcdir)/src/msw/data.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/data.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_data.o: $(srcdir)/src/msw/data.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/data.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_dc.o: $(srcdir)/src/msw/dc.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dc.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_dc.o: $(srcdir)/src/msw/dc.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dc.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dcclient.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dcclient.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_dcprint.o: $(srcdir)/src/msw/dcprint.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dcprint.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_dcprint.o: $(srcdir)/src/msw/dcprint.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dcprint.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_dcscreen.o: $(srcdir)/src/msw/dcscreen.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dcscreen.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_dcscreen.o: $(srcdir)/src/msw/dcscreen.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dcscreen.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_dialup.o: $(srcdir)/src/msw/dialup.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_dialup.o: $(srcdir)/src/msw/dialup.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_dib.o: $(srcdir)/src/msw/dib.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dib.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_dib.o: $(srcdir)/src/msw/dib.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dib.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_display.o: $(srcdir)/src/msw/display.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/display.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_display.o: $(srcdir)/src/msw/display.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/display.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_font.o: $(srcdir)/src/msw/font.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/font.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_font.o: $(srcdir)/src/msw/font.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/font.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_graphics.o: $(srcdir)/src/msw/graphics.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_graphics.o: $(srcdir)/src/msw/graphics.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_icon.o: $(srcdir)/src/msw/icon.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_icon.o: $(srcdir)/src/msw/icon.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_minifram.o: $(srcdir)/src/msw/minifram.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_minifram.o: $(srcdir)/src/msw/minifram.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_ole_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/dataobj.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_ole_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/dataobj.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/dropsrc.cpp
@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/dropsrc.cpp
@@ -16256,17 +16716,29 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_printdlg.o: $(srcdir)/src/msw/printdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/printdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_palette.o: $(srcdir)/src/msw/palette.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/palette.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_printdlg.o: $(srcdir)/src/msw/printdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/printdlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_palette.o: $(srcdir)/src/msw/palette.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/palette.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_printdlg.o: $(srcdir)/src/osx/carbon/printdlg.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/printdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_pen.o: $(srcdir)/src/msw/pen.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/pen.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_printdlg.o: $(srcdir)/src/osx/carbon/printdlg.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/printdlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_pen.o: $(srcdir)/src/msw/pen.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/pen.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_popupwin.o: $(srcdir)/src/msw/popupwin.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/popupwin.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_popupwin.o: $(srcdir)/src/msw/popupwin.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/popupwin.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_printdlg.o: $(srcdir)/src/msw/printdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/printdlg.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_printdlg.o: $(srcdir)/src/msw/printdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/printdlg.cpp
@COND_TOOLKIT_MSW_USE_GUI_1@monodll_printwin.o: $(srcdir)/src/msw/printwin.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/printwin.cpp
@@ -16274,66 +16746,72 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_printwin.o: $(srcdir)/src/msw/printwin.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/printwin.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_region.o: $(srcdir)/src/msw/region.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/region.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_region.o: $(srcdir)/src/msw/region.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/region.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_renderer.o: $(srcdir)/src/msw/renderer.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/renderer.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_renderer.o: $(srcdir)/src/msw/renderer.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/renderer.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_settings.o: $(srcdir)/src/msw/settings.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/settings.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_settings.o: $(srcdir)/src/msw/settings.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/settings.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_utilsgui.o: $(srcdir)/src/os2/utilsgui.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/utilsgui.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1@monodll_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/uxtheme.cpp
@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/uxtheme.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_window.o: $(srcdir)/src/msw/window.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/window.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_window.o: $(srcdir)/src/msw/window.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/window.cpp
+
@COND_TOOLKIT_MSW_USE_GUI_1@monodll_helpchm.o: $(srcdir)/src/msw/helpchm.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/helpchm.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_helpwin.o: $(srcdir)/src/msw/helpwin.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_helpwin.o: $(srcdir)/src/msw/helpwin.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/helpwin.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_helpwin.o: $(srcdir)/src/os2/helpwin.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/helpwin.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1@monodll_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/automtn.cpp
@COND_TOOLKIT_MSW_USE_GUI_1@monodll_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/uuid.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_accel.o: $(srcdir)/src/osx/accel.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_osx_accel.o: $(srcdir)/src/osx/accel.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/accel.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_accel.o: $(srcdir)/src/osx/accel.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_osx_accel.o: $(srcdir)/src/osx/accel.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/accel.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monodll_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/motif/accel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/accel.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/msw/accel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/msw/accel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/os2/accel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/accel.cpp
-
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_artmac.o: $(srcdir)/src/osx/artmac.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
@@ -16346,6 +16824,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_osx_brush.o: $(srcdir)/src/osx/brush.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_osx_brush.o: $(srcdir)/src/osx/brush.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
+
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp
@@ -16376,12 +16860,24 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_osx_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_osx_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
+
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_osx_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_osx_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
+
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp
@@ -16400,6 +16896,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_osx_minifram.o: $(srcdir)/src/osx/minifram.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_osx_minifram.o: $(srcdir)/src/osx/minifram.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
+
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp
@@ -16412,6 +16914,18 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_osx_palette.o: $(srcdir)/src/osx/palette.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_osx_palette.o: $(srcdir)/src/osx/palette.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_osx_pen.o: $(srcdir)/src/osx/pen.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_osx_pen.o: $(srcdir)/src/osx/pen.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
+
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp
@@ -16514,21 +17028,57 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_hid.o: $(srcdir)/src/osx/core/hid.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_core_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_hid.o: $(srcdir)/src/osx/core/hid.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_core_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@monodll_hid.o: $(srcdir)/src/osx/core/hid.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_core_colour.o: $(srcdir)/src/osx/core/colour.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_core_colour.o: $(srcdir)/src/osx/core/colour.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_core_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_core_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_core_display.o: $(srcdir)/src/osx/core/display.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_core_display.o: $(srcdir)/src/osx/core/display.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_core_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_core_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_hid.o: $(srcdir)/src/osx/core/hid.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_hid.o: $(srcdir)/src/osx/core/hid.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1@monodll_hid.o: $(srcdir)/src/osx/core/hid.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_core_timer.o: $(srcdir)/src/osx/core/timer.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_core_timer.o: $(srcdir)/src/osx/core/timer.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
+
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
@@ -16538,50 +17088,221 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_COCOA_USE_GUI_1@monodll_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_generic_timer.o: $(srcdir)/src/generic/timer.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
+
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_generic_timer.o: $(srcdir)/src/generic/timer.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
+
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_generic_timer.o: $(srcdir)/src/generic/timer.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_app.o: $(srcdir)/src/x11/app.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/app.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_clipbrd.o: $(srcdir)/src/x11/clipbrd.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/clipbrd.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_colour.o: $(srcdir)/src/x11/colour.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/colour.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_cursor.o: $(srcdir)/src/x11/cursor.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/cursor.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_data.o: $(srcdir)/src/x11/data.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/data.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_dataobj.o: $(srcdir)/src/x11/dataobj.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/dataobj.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_dc.o: $(srcdir)/src/x11/dc.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/dc.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_dcclient.o: $(srcdir)/src/x11/dcclient.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/dcclient.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_dcmemory.o: $(srcdir)/src/x11/dcmemory.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/dcmemory.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_dcscreen.o: $(srcdir)/src/x11/dcscreen.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/dcscreen.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_evtloop.o: $(srcdir)/src/x11/evtloop.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/evtloop.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_font.o: $(srcdir)/src/x11/font.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/font.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_minifram.o: $(srcdir)/src/x11/minifram.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/minifram.cpp
+
@COND_TOOLKIT_X11_USE_GUI_1@monodll_nanox.o: $(srcdir)/src/x11/nanox.c $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/x11/nanox.c
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_popupwin.o: $(srcdir)/src/x11/popupwin.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/popupwin.cpp
+
@COND_TOOLKIT_X11_USE_GUI_1@monodll_reparent.o: $(srcdir)/src/x11/reparent.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/reparent.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_settings.o: $(srcdir)/src/x11/settings.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/settings.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_toplevel.o: $(srcdir)/src/x11/toplevel.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/toplevel.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_utils.o: $(srcdir)/src/x11/utils.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/utils.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_window.o: $(srcdir)/src/x11/window.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/window.cpp
+
@COND_TOOLKIT_MGL_USE_GUI_1@monodll_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
@COND_TOOLKIT_DFB_USE_GUI_1@monodll_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_generic_colour.o: $(srcdir)/src/generic/colour.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
+
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_generic_colour.o: $(srcdir)/src/generic/colour.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
+
@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mask.o: $(srcdir)/src/generic/mask.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
@COND_TOOLKIT_DFB_USE_GUI_1@monodll_mask.o: $(srcdir)/src/generic/mask.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_app.o: $(srcdir)/src/mgl/app.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/app.cpp
+
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_bitmap.o: $(srcdir)/src/mgl/bitmap.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/bitmap.cpp
+
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_brush.o: $(srcdir)/src/mgl/brush.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/brush.cpp
+
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_clipbrd.o: $(srcdir)/src/mgl/clipbrd.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/clipbrd.cpp
+
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_cursor.o: $(srcdir)/src/mgl/cursor.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/cursor.cpp
+
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_data.o: $(srcdir)/src/mgl/data.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/data.cpp
+
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_dc.o: $(srcdir)/src/mgl/dc.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/dc.cpp
+
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/dcclient.cpp
+
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_dcmemory.o: $(srcdir)/src/mgl/dcmemory.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/dcmemory.cpp
+
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_dcscreen.o: $(srcdir)/src/mgl/dcscreen.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/dcscreen.cpp
+
@COND_TOOLKIT_MGL_USE_GUI_1@monodll_dirmgl.o: $(srcdir)/src/mgl/dirmgl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/dirmgl.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_fontmgr.o: $(srcdir)/src/mgl/fontmgr.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/evtloop.cpp
+
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_font.o: $(srcdir)/src/mgl/font.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/font.cpp
+
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_fontenum.o: $(srcdir)/src/mgl/fontenum.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/fontenum.cpp
+
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_fontmgr.o: $(srcdir)/src/mgl/fontmgr.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/fontmgr.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_fontmgr.o: $(srcdir)/src/dfb/fontmgr.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_fontutil.o: $(srcdir)/src/mgl/fontutil.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/fontutil.cpp
+
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_palette.o: $(srcdir)/src/mgl/palette.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/palette.cpp
+
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_pen.o: $(srcdir)/src/mgl/pen.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/pen.cpp
+
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_region.o: $(srcdir)/src/mgl/region.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/region.cpp
+
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_settings.o: $(srcdir)/src/mgl/settings.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/settings.cpp
+
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_toplevel.o: $(srcdir)/src/mgl/toplevel.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/toplevel.cpp
+
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_utils.o: $(srcdir)/src/mgl/utils.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/utils.cpp
+
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_window.o: $(srcdir)/src/mgl/window.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/window.cpp
+
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_app.o: $(srcdir)/src/dfb/app.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/app.cpp
+
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_bitmap.o: $(srcdir)/src/dfb/bitmap.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/bitmap.cpp
+
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_brush.o: $(srcdir)/src/dfb/brush.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/brush.cpp
+
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_cursor.o: $(srcdir)/src/dfb/cursor.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/cursor.cpp
+
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_dc.o: $(srcdir)/src/dfb/dc.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/dc.cpp
+
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_dcclient.o: $(srcdir)/src/dfb/dcclient.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/dcclient.cpp
+
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_dcmemory.o: $(srcdir)/src/dfb/dcmemory.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/dcmemory.cpp
+
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_dcscreen.o: $(srcdir)/src/dfb/dcscreen.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/dcscreen.cpp
+
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_evtloop.o: $(srcdir)/src/dfb/evtloop.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/evtloop.cpp
+
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_font.o: $(srcdir)/src/dfb/font.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/font.cpp
+
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_fontenum.o: $(srcdir)/src/dfb/fontenum.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/fontenum.cpp
+
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_fontmgr.o: $(srcdir)/src/dfb/fontmgr.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/fontmgr.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_nonownedwnd.o: $(srcdir)/src/dfb/nonownedwnd.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_nonownedwnd.o: $(srcdir)/src/dfb/nonownedwnd.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/nonownedwnd.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_nonownedwnd.o: $(srcdir)/src/osx/carbon/nonownedwnd.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/nonownedwnd.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_overlay.o: $(srcdir)/src/dfb/overlay.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/overlay.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_nonownedwnd.o: $(srcdir)/src/osx/cocoa/nonownedwnd.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/nonownedwnd.mm
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_pen.o: $(srcdir)/src/dfb/pen.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/pen.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_overlay.o: $(srcdir)/src/dfb/overlay.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/overlay.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_region.o: $(srcdir)/src/dfb/region.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/region.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_settings.o: $(srcdir)/src/dfb/settings.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/settings.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_toplevel.o: $(srcdir)/src/dfb/toplevel.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/toplevel.cpp
+
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_utils.o: $(srcdir)/src/dfb/utils.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/utils.cpp
+
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_window.o: $(srcdir)/src/dfb/window.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/window.cpp
@COND_TOOLKIT_DFB_USE_GUI_1@monodll_wrapdfb.o: $(srcdir)/src/dfb/wrapdfb.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/wrapdfb.cpp
@@ -16592,36 +17313,45 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_USE_GUI_1@monodll_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_USE_GUI_1_WXUNIV_1@monodll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_USE_GUI_1_WXUNIV_1@monodll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@monodll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_fdrepdlg.o: $(srcdir)/src/msw/fdrepdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/fdrepdlg.cpp
-
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
@@ -16652,36 +17382,30 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1_WXUNIV_1@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_USE_GUI_1_WXUNIV_1@monodll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_listctrl.o: $(srcdir)/src/msw/listctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/listctrl.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_listctrl.o: $(srcdir)/src/msw/listctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/listctrl.cpp
-
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
@@ -16709,36 +17433,33 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1_WXUNIV_1@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_USE_GUI_1_WXUNIV_1@monodll_statusbr.o: $(srcdir)/src/univ/statusbr.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/statusbr.cpp
-
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
@@ -16796,2286 +17517,2094 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1_WXUNIV_1@monodll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_bmpbuttn.o: $(srcdir)/src/gtk/bmpbuttn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/bmpbuttn.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_bmpbuttn.o: $(srcdir)/src/gtk1/bmpbuttn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/bmpbuttn.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_bmpbuttn.o: $(srcdir)/src/motif/bmpbuttn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/bmpbuttn.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_bmpbuttn.o: $(srcdir)/src/osx/carbon/bmpbuttn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/bmpbuttn.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_bmpbuttn.o: $(srcdir)/src/osx/cocoa/bmpbuttn.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/bmpbuttn.mm
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_bmpbuttn.o: $(srcdir)/src/cocoa/bmpbuttn.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/bmpbuttn.mm
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_bmpbuttn.o: $(srcdir)/src/os2/bmpbuttn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/bmpbuttn.cpp
+@COND_USE_GUI_1_WXUNIV_1@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-@COND_USE_GUI_1_WXUNIV_1@monodll_bmpbuttn.o: $(srcdir)/src/univ/bmpbuttn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/bmpbuttn.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_button.o: $(srcdir)/src/gtk/button.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/button.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_button.o: $(srcdir)/src/gtk1/button.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/button.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_button.o: $(srcdir)/src/motif/button.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/button.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_button.o: $(srcdir)/src/msw/button.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/button.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_button.o: $(srcdir)/src/msw/button.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/button.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_button.o: $(srcdir)/src/osx/carbon/button.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/button.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_button.o: $(srcdir)/src/osx/cocoa/button.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/button.mm
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_button.o: $(srcdir)/src/cocoa/button.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/button.mm
+@COND_USE_GUI_1_WXUNIV_1@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_button.o: $(srcdir)/src/os2/button.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/button.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
-@COND_USE_GUI_1_WXUNIV_1@monodll_button.o: $(srcdir)/src/univ/button.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/button.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_checkbox.o: $(srcdir)/src/gtk/checkbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/checkbox.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_checkbox.o: $(srcdir)/src/gtk1/checkbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/checkbox.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_checkbox.o: $(srcdir)/src/motif/checkbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/checkbox.cpp
+@COND_USE_GUI_1_WXUNIV_1@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/checkbox.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/checkbox.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_checkbox.o: $(srcdir)/src/osx/carbon/checkbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/checkbox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_checkbox.o: $(srcdir)/src/osx/cocoa/checkbox.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/checkbox.mm
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_checkbox.o: $(srcdir)/src/cocoa/checkbox.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/checkbox.mm
+@COND_USE_GUI_1_WXUNIV_1@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_checkbox.o: $(srcdir)/src/os2/checkbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/checkbox.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
-@COND_USE_GUI_1_WXUNIV_1@monodll_checkbox.o: $(srcdir)/src/univ/checkbox.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/checkbox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_checklst.o: $(srcdir)/src/gtk/checklst.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/checklst.cpp
+@COND_USE_GUI_1_WXUNIV_1@monodll_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_checklst.o: $(srcdir)/src/gtk1/checklst.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/checklst.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_checklst.o: $(srcdir)/src/motif/checklst.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/checklst.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_checklst.o: $(srcdir)/src/msw/checklst.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_checklst.o: $(srcdir)/src/msw/wince/checklst.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/checklst.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_checklst.o: $(srcdir)/src/cocoa/checklst.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/checklst.mm
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_checklst.o: $(srcdir)/src/os2/checklst.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/checklst.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-@COND_USE_GUI_1_WXUNIV_1@monodll_checklst.o: $(srcdir)/src/univ/checklst.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/checklst.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_choice.o: $(srcdir)/src/gtk/choice.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/choice.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_choice.o: $(srcdir)/src/gtk1/choice.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/choice.cpp
+@COND_USE_GUI_1_WXUNIV_1@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_choice.o: $(srcdir)/src/motif/choice.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/choice.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_choice.o: $(srcdir)/src/msw/choice.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/choice.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_choice.o: $(srcdir)/src/msw/choice.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/choice.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_choice.o: $(srcdir)/src/osx/carbon/choice.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/choice.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_choice.o: $(srcdir)/src/osx/cocoa/choice.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/choice.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_button.o: $(srcdir)/src/msw/button.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/button.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_button.o: $(srcdir)/src/msw/button.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/button.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_choice.o: $(srcdir)/src/cocoa/choice.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/choice.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/checkbox.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_choice.o: $(srcdir)/src/os2/choice.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/choice.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/checkbox.cpp
-@COND_USE_GUI_1_WXUNIV_1@monodll_choice.o: $(srcdir)/src/univ/choice.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/choice.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_choice.o: $(srcdir)/src/msw/choice.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/choice.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_colordlg.o: $(srcdir)/src/gtk/colordlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/colordlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_choice.o: $(srcdir)/src/msw/choice.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/choice.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/colordlg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/colordlg.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_colordlg.o: $(srcdir)/src/osx/carbon/colordlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/colordlg.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_colordlg.o: $(srcdir)/src/cocoa/colordlg.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/colordlg.mm
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_combobox.o: $(srcdir)/src/gtk/combobox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/combobox.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_combobox.o: $(srcdir)/src/gtk1/combobox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/combobox.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_combo.o: $(srcdir)/src/msw/combo.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/combo.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_combobox.o: $(srcdir)/src/motif/combobox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/combobox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_combo.o: $(srcdir)/src/msw/combo.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/combo.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_combobox.o: $(srcdir)/src/msw/combobox.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_combobox.o: $(srcdir)/src/msw/combobox.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/combobox.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_combobox.o: $(srcdir)/src/msw/combobox.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_combobox.o: $(srcdir)/src/msw/combobox.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/combobox.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_combobox.o: $(srcdir)/src/cocoa/combobox.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/combobox.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_combobox.o: $(srcdir)/src/os2/combobox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/combobox.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monodll_combobox.o: $(srcdir)/src/univ/combobox.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/combobox.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_control.o: $(srcdir)/src/gtk/control.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/control.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_control.o: $(srcdir)/src/gtk1/control.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/control.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_control.o: $(srcdir)/src/motif/control.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/control.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_control.o: $(srcdir)/src/msw/control.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_control.o: $(srcdir)/src/msw/control.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/control.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_control.o: $(srcdir)/src/msw/control.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_control.o: $(srcdir)/src/msw/control.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/control.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_control.o: $(srcdir)/src/osx/carbon/control.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_control.o: $(srcdir)/src/osx/carbon/control.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_control.o: $(srcdir)/src/cocoa/control.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/control.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_control.o: $(srcdir)/src/os2/control.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/control.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monodll_control.o: $(srcdir)/src/univ/control.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/control.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_dialog.o: $(srcdir)/src/gtk/dialog.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dialog.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_dialog.o: $(srcdir)/src/gtk1/dialog.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/dialog.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_dialog.o: $(srcdir)/src/motif/dialog.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/dialog.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_dialog.o: $(srcdir)/src/msw/dialog.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_dialog.o: $(srcdir)/src/msw/dialog.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dialog.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_dialog.o: $(srcdir)/src/msw/dialog.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_dialog.o: $(srcdir)/src/msw/dialog.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dialog.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_dialog.o: $(srcdir)/src/osx/carbon/dialog.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dialog.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_dialog.o: $(srcdir)/src/osx/cocoa/dialog.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/dialog.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_dialog.o: $(srcdir)/src/cocoa/dialog.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/dialog.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dialog.o: $(srcdir)/src/os2/dialog.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dialog.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monodll_dialog.o: $(srcdir)/src/univ/dialog.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/dialog.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_dirdlg.o: $(srcdir)/src/gtk/dirdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dirdlg.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_dirdlg.o: $(srcdir)/src/msw/dirdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_dirdlg.o: $(srcdir)/src/msw/dirdlg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dirdlg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_dirdlg.o: $(srcdir)/src/msw/dirdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_dirdlg.o: $(srcdir)/src/msw/dirdlg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dirdlg.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_dirdlg.o: $(srcdir)/src/osx/carbon/dirdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dirdlg.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_dirdlg.o: $(srcdir)/src/osx/cocoa/dirdlg.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/dirdlg.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_dirdlg.o: $(srcdir)/src/cocoa/dirdlg.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/dirdlg.mm
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/gtk/filedlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/filedlg.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/gtk1/filedlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/filedlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/motif/filedlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/filedlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/osx/carbon/filedlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/filedlg.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/osx/cocoa/filedlg.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/filedlg.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/cocoa/filedlg.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/filedlg.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/os2/filedlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/filedlg.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_fontdlg.o: $(srcdir)/src/gtk/fontdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/fontdlg.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_fontdlg.o: $(srcdir)/src/gtk1/fontdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/fontdlg.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_fontdlg.o: $(srcdir)/src/msw/fontdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/fontdlg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontdlg.o: $(srcdir)/src/cocoa/fontdlg.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/fontdlg.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_fontdlg.o: $(srcdir)/src/os2/fontdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/fontdlg.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_frame.o: $(srcdir)/src/gtk/frame.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/frame.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_frame.o: $(srcdir)/src/gtk1/frame.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/frame.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_frame.o: $(srcdir)/src/motif/frame.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/frame.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_frame.o: $(srcdir)/src/msw/frame.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_frame.o: $(srcdir)/src/msw/frame.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/frame.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_frame.o: $(srcdir)/src/msw/frame.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_frame.o: $(srcdir)/src/msw/frame.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/frame.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_frame.o: $(srcdir)/src/cocoa/frame.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/frame.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_frame.o: $(srcdir)/src/os2/frame.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/frame.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/gtk/gauge.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/gauge.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/gtk1/gauge.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/gauge.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/motif/gauge.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/gauge.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/msw/gauge.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_gauge.o: $(srcdir)/src/msw/gauge.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/msw/gauge.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_gauge.o: $(srcdir)/src/msw/gauge.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/osx/carbon/gauge.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/gauge.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/osx/cocoa/gauge.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/gauge.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/cocoa/gauge.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/gauge.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/os2/gauge.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/gauge.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monodll_gauge.o: $(srcdir)/src/univ/gauge.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/gauge.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_print.o: $(srcdir)/src/gtk/print.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/print.cpp
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_print.o: $(srcdir)/src/os2/print.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/print.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_listbox.o: $(srcdir)/src/gtk/listbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/listbox.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_listbox.o: $(srcdir)/src/gtk1/listbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/listbox.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_listbox.o: $(srcdir)/src/motif/listbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/listbox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_listbox.o: $(srcdir)/src/msw/listbox.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_listbox.o: $(srcdir)/src/msw/listbox.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/listbox.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_listbox.o: $(srcdir)/src/msw/listbox.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_listbox.o: $(srcdir)/src/msw/listbox.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/listbox.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_listbox.o: $(srcdir)/src/osx/carbon/listbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/listbox.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_listbox.o: $(srcdir)/src/osx/cocoa/listbox.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/listbox.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_listbox.o: $(srcdir)/src/cocoa/listbox.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/listbox.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_listbox.o: $(srcdir)/src/os2/listbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/listbox.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monodll_listbox.o: $(srcdir)/src/univ/listbox.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/listbox.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_mdi.o: $(srcdir)/src/gtk/mdi.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/mdi.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_mdi.o: $(srcdir)/src/gtk1/mdi.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/mdi.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_listctrl.o: $(srcdir)/src/msw/listctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/listctrl.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_mdi.o: $(srcdir)/src/motif/mdi.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/mdi.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_listctrl.o: $(srcdir)/src/msw/listctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/listctrl.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_mdi.o: $(srcdir)/src/msw/mdi.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_mdi.o: $(srcdir)/src/msw/mdi.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mdi.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_mdi.o: $(srcdir)/src/msw/mdi.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_mdi.o: $(srcdir)/src/msw/mdi.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mdi.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_mdi.o: $(srcdir)/src/osx/carbon/mdi.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/mdi.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_mdi.o: $(srcdir)/src/osx/carbon/mdi.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/mdi.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_mdi.o: $(srcdir)/src/cocoa/mdi.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/mdi.mm
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_menu.o: $(srcdir)/src/gtk/menu.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/menu.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_menu.o: $(srcdir)/src/gtk1/menu.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/menu.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_menu.o: $(srcdir)/src/motif/menu.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/menu.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_menu.o: $(srcdir)/src/msw/menu.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_menu.o: $(srcdir)/src/msw/menu.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/menu.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_menu.o: $(srcdir)/src/msw/menu.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_menu.o: $(srcdir)/src/msw/menu.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/menu.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_menu.o: $(srcdir)/src/osx/carbon/menu.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/menu.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_menu.o: $(srcdir)/src/osx/cocoa/menu.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/menu.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_menu.o: $(srcdir)/src/cocoa/menu.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/menu.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_menu.o: $(srcdir)/src/os2/menu.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/menu.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_menuitem.o: $(srcdir)/src/msw/menuitem.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/menuitem.cpp
-@COND_USE_GUI_1_WXUNIV_1@monodll_menu.o: $(srcdir)/src/univ/menu.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/menu.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_menuitem.o: $(srcdir)/src/msw/menuitem.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/menuitem.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_msgdlg.o: $(srcdir)/src/gtk/msgdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/msgdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_metafile.o: $(srcdir)/src/msw/metafile.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/metafile.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_msgdlg.o: $(srcdir)/src/motif/msgdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/msgdlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_metafile.o: $(srcdir)/src/msw/metafile.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/metafile.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/msgdlg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/msgdlg.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_msgdlg.o: $(srcdir)/src/osx/carbon/msgdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/msgdlg.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_msgdlg.o: $(srcdir)/src/osx/cocoa/msgdlg.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/msgdlg.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_msgdlg.o: $(srcdir)/src/cocoa/msgdlg.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/msgdlg.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_msgdlg.o: $(srcdir)/src/os2/msgdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/msgdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_nativewin.o: $(srcdir)/src/gtk/nativewin.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/nativewin.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/nativewin.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/nativewin.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_notebook.o: $(srcdir)/src/gtk/notebook.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/notebook.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_notebook.o: $(srcdir)/src/gtk1/notebook.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/notebook.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_notebook.o: $(srcdir)/src/generic/notebook.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/notebook.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_notebook.o: $(srcdir)/src/msw/notebook.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_notebook.o: $(srcdir)/src/msw/notebook.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/notebook.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_notebook.o: $(srcdir)/src/msw/notebook.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_notebook.o: $(srcdir)/src/msw/notebook.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/notebook.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_notebook.o: $(srcdir)/src/osx/cocoa/notebook.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/notebook.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_notebook.o: $(srcdir)/src/cocoa/notebook.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/notebook.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_notebook.o: $(srcdir)/src/os2/notebook.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/notebook.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monodll_notebook.o: $(srcdir)/src/univ/notebook.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/notebook.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_access.o: $(srcdir)/src/msw/ole/access.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_radiobox.o: $(srcdir)/src/gtk/radiobox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/radiobox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_access.o: $(srcdir)/src/msw/ole/access.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_radiobox.o: $(srcdir)/src/gtk1/radiobox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/radiobox.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_radiobox.o: $(srcdir)/src/motif/radiobox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/radiobox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/radiobox.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/radiobox.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_radiobox.o: $(srcdir)/src/cocoa/radiobox.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/radiobox.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_radiobox.o: $(srcdir)/src/os2/radiobox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/radiobox.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monodll_radiobox.o: $(srcdir)/src/univ/radiobox.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/radiobox.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_radiobut.o: $(srcdir)/src/gtk/radiobut.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/radiobut.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_radiobut.o: $(srcdir)/src/gtk1/radiobut.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/radiobut.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_radiobut.o: $(srcdir)/src/motif/radiobut.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/radiobut.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/radiobut.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/radiobut.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_radiobut.o: $(srcdir)/src/osx/carbon/radiobut.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/radiobut.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_radiobut.o: $(srcdir)/src/osx/cocoa/radiobut.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/radiobut.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_radiobut.o: $(srcdir)/src/cocoa/radiobut.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/radiobut.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_slider.o: $(srcdir)/src/msw/slider.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_radiobut.o: $(srcdir)/src/os2/radiobut.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/radiobut.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_slider.o: $(srcdir)/src/msw/slider.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
-@COND_USE_GUI_1_WXUNIV_1@monodll_radiobut.o: $(srcdir)/src/univ/radiobut.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/radiobut.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/spinbutt.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_scrolbar.o: $(srcdir)/src/gtk/scrolbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/scrolbar.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/spinbutt.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_scrolbar.o: $(srcdir)/src/gtk1/scrolbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/scrolbar.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_scrolbar.o: $(srcdir)/src/motif/scrolbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/scrolbar.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statbmp.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statbmp.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_scrolbar.o: $(srcdir)/src/osx/carbon/scrolbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/scrolbar.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_statbox.o: $(srcdir)/src/msw/statbox.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_scrolbar.o: $(srcdir)/src/osx/cocoa/scrolbar.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/scrolbar.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_statbox.o: $(srcdir)/src/msw/statbox.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_scrolbar.o: $(srcdir)/src/cocoa/scrolbar.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/scrolbar.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/scrolbar.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
-@COND_USE_GUI_1_WXUNIV_1@monodll_scrolbar.o: $(srcdir)/src/univ/scrolbar.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/scrolbar.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_statline.o: $(srcdir)/src/msw/statline.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statline.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_scrolwin.o: $(srcdir)/src/gtk/scrolwin.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/scrolwin.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_statline.o: $(srcdir)/src/msw/statline.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statline.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_scrolwin.o: $(srcdir)/src/gtk1/scrolwin.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/scrolwin.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_stattext.o: $(srcdir)/src/msw/stattext.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/gtk/slider.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/slider.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_stattext.o: $(srcdir)/src/msw/stattext.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/gtk1/slider.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/slider.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/tabctrl.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/motif/slider.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/slider.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/tabctrl.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/msw/slider.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/msw/slider.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/osx/carbon/slider.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/slider.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/textctrl.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/osx/cocoa/slider.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/slider.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/textctrl.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/cocoa/slider.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/slider.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_textentry.o: $(srcdir)/src/msw/textentry.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/os2/slider.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/slider.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_textentry.o: $(srcdir)/src/msw/textentry.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp
-@COND_USE_GUI_1_WXUNIV_1@monodll_slider.o: $(srcdir)/src/univ/slider.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/slider.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/tglbtn.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_spinbutt.o: $(srcdir)/src/gtk/spinbutt.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/spinbutt.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/tglbtn.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_spinbutt.o: $(srcdir)/src/gtk1/spinbutt.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/spinbutt.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_spinbutt.o: $(srcdir)/src/motif/spinbutt.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/spinbutt.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/spinbutt.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/spinbutt.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_spinbutt.o: $(srcdir)/src/osx/carbon/spinbutt.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/spinbutt.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_spinbutt.o: $(srcdir)/src/osx/cocoa/spinbutt.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/spinbutt.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_spinbutt.o: $(srcdir)/src/cocoa/spinbutt.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/spinbutt.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_spinbutt.o: $(srcdir)/src/os2/spinbutt.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/spinbutt.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
-@COND_USE_GUI_1_WXUNIV_1@monodll_spinbutt.o: $(srcdir)/src/univ/spinbutt.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/spinbutt.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_spinctrl.o: $(srcdir)/src/gtk/spinctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/spinctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_spinctrl.o: $(srcdir)/src/gtk1/spinctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/spinctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/spinctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_statbmp.o: $(srcdir)/src/gtk/statbmp.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/statbmp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_statbmp.o: $(srcdir)/src/gtk1/statbmp.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/statbmp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_statbmp.o: $(srcdir)/src/motif/statbmp.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/statbmp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_app.o: $(srcdir)/src/osx/carbon/app.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statbmp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_app.o: $(srcdir)/src/osx/carbon/app.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statbmp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_statbmp.o: $(srcdir)/src/osx/carbon/statbmp.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbmp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_statbmp.o: $(srcdir)/src/cocoa/statbmp.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/statbmp.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_control.o: $(srcdir)/src/osx/carbon/control.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_statbmp.o: $(srcdir)/src/os2/statbmp.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/statbmp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_control.o: $(srcdir)/src/osx/carbon/control.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
-@COND_USE_GUI_1_WXUNIV_1@monodll_statbmp.o: $(srcdir)/src/univ/statbmp.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/statbmp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_statbox.o: $(srcdir)/src/gtk/statbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/statbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_statbox.o: $(srcdir)/src/gtk1/statbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/statbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_statbox.o: $(srcdir)/src/motif/statbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/statbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_statbox.o: $(srcdir)/src/msw/statbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_statbox.o: $(srcdir)/src/msw/statbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_statbox.o: $(srcdir)/src/osx/carbon/statbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_statbox.o: $(srcdir)/src/osx/cocoa/statbox.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/statbox.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_statbox.o: $(srcdir)/src/cocoa/statbox.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/statbox.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_statbox.o: $(srcdir)/src/os2/statbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/statbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
-@COND_USE_GUI_1_WXUNIV_1@monodll_statbox.o: $(srcdir)/src/univ/statbox.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/statbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_dnd.o: $(srcdir)/src/osx/carbon/dnd.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dnd.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_statline.o: $(srcdir)/src/gtk/statline.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/statline.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_dnd.o: $(srcdir)/src/osx/carbon/dnd.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dnd.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_statline.o: $(srcdir)/src/gtk1/statline.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/statline.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_font.o: $(srcdir)/src/osx/carbon/font.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_statline.o: $(srcdir)/src/generic/statline.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statline.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_font.o: $(srcdir)/src/osx/carbon/font.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_statline.o: $(srcdir)/src/msw/statline.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statline.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_statline.o: $(srcdir)/src/msw/statline.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statline.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_statline.o: $(srcdir)/src/osx/cocoa/statline.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/statline.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_mdi.o: $(srcdir)/src/osx/carbon/mdi.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/mdi.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_statline.o: $(srcdir)/src/os2/statline.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/statline.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_mdi.o: $(srcdir)/src/osx/carbon/mdi.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/mdi.cpp
-@COND_USE_GUI_1_WXUNIV_1@monodll_statline.o: $(srcdir)/src/univ/statline.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/statline.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_stattext.o: $(srcdir)/src/gtk/stattext.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/stattext.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_stattext.o: $(srcdir)/src/gtk1/stattext.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/stattext.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_stattext.o: $(srcdir)/src/motif/stattext.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/stattext.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_stattext.o: $(srcdir)/src/msw/stattext.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_stattext.o: $(srcdir)/src/msw/stattext.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_stattext.o: $(srcdir)/src/osx/carbon/stattext.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/stattext.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_printdlg.o: $(srcdir)/src/osx/carbon/printdlg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/printdlg.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_stattext.o: $(srcdir)/src/osx/cocoa/stattext.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/stattext.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_printdlg.o: $(srcdir)/src/osx/carbon/printdlg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/printdlg.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_stattext.o: $(srcdir)/src/cocoa/stattext.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/stattext.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_stattext.o: $(srcdir)/src/os2/stattext.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/stattext.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
-@COND_USE_GUI_1_WXUNIV_1@monodll_stattext.o: $(srcdir)/src/univ/stattext.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/stattext.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/tbargtk.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_tbargtk.o: $(srcdir)/src/gtk1/tbargtk.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/tbargtk.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/textctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_textctrl.o: $(srcdir)/src/gtk1/textctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/textctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_tabctrl.o: $(srcdir)/src/osx/carbon/tabctrl.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/tabctrl.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_textctrl.o: $(srcdir)/src/motif/textctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/textctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_tabctrl.o: $(srcdir)/src/osx/carbon/tabctrl.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/tabctrl.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/textctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/textctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_textctrl.o: $(srcdir)/src/osx/carbon/textctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/textctrl.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_regiong.o: $(srcdir)/src/generic/regiong.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_textctrl.o: $(srcdir)/src/osx/cocoa/textctrl.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/textctrl.mm
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_regiong.o: $(srcdir)/src/generic/regiong.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_textctrl.o: $(srcdir)/src/cocoa/textctrl.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/textctrl.mm
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_textctrl.o: $(srcdir)/src/os2/textctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/textctrl.cpp
+@COND_USE_GUI_1_WXUNIV_1@monodll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
-@COND_USE_GUI_1_WXUNIV_1@monodll_textctrl.o: $(srcdir)/src/univ/textctrl.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/textctrl.cpp
+@COND_USE_GUI_1@monodll_accelcmn.o: $(srcdir)/src/common/accelcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/accelcmn.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_textentry.o: $(srcdir)/src/gtk/textentry.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/textentry.cpp
+@COND_USE_GUI_1@monodll_accesscmn.o: $(srcdir)/src/common/accesscmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/accesscmn.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_textentry.o: $(srcdir)/src/motif/textentry.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/textentry.cpp
+@COND_USE_GUI_1@monodll_anidecod.o: $(srcdir)/src/common/anidecod.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/anidecod.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_textentry.o: $(srcdir)/src/msw/textentry.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp
+@COND_USE_GUI_1@monodll_appcmn.o: $(srcdir)/src/common/appcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/appcmn.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_textentry.o: $(srcdir)/src/msw/textentry.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp
+@COND_USE_GUI_1@monodll_artprov.o: $(srcdir)/src/common/artprov.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/artprov.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_textentry.o: $(srcdir)/src/os2/textentry.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/textentry.cpp
+@COND_USE_GUI_1@monodll_artstd.o: $(srcdir)/src/common/artstd.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/artstd.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_tglbtn.o: $(srcdir)/src/gtk/tglbtn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/tglbtn.cpp
+@COND_USE_GUI_1@monodll_bmpbase.o: $(srcdir)/src/common/bmpbase.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/bmpbase.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_tglbtn.o: $(srcdir)/src/gtk1/tglbtn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/tglbtn.cpp
+@COND_USE_GUI_1@monodll_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/bookctrl.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/tglbtn.cpp
+@COND_USE_GUI_1@monodll_btncmn.o: $(srcdir)/src/common/btncmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/btncmn.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/tglbtn.cpp
+@COND_USE_GUI_1@monodll_cairo.o: $(srcdir)/src/common/cairo.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/cairo.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_tglbtn.o: $(srcdir)/src/osx/carbon/tglbtn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/tglbtn.cpp
+@COND_USE_GUI_1@monodll_choiccmn.o: $(srcdir)/src/common/choiccmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/choiccmn.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_tglbtn.o: $(srcdir)/src/osx/cocoa/tglbtn.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/tglbtn.mm
+@COND_USE_GUI_1@monodll_clipcmn.o: $(srcdir)/src/common/clipcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/clipcmn.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_tglbtn.o: $(srcdir)/src/os2/tglbtn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/tglbtn.cpp
+@COND_USE_GUI_1@monodll_clrpickercmn.o: $(srcdir)/src/common/clrpickercmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/clrpickercmn.cpp
-@COND_USE_GUI_1_WXUNIV_1@monodll_tglbtn.o: $(srcdir)/src/univ/tglbtn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/tglbtn.cpp
+@COND_USE_GUI_1@monodll_colourcmn.o: $(srcdir)/src/common/colourcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/colourcmn.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_USE_GUI_1@monodll_combocmn.o: $(srcdir)/src/common/combocmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/combocmn.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_USE_GUI_1@monodll_cmdproc.o: $(srcdir)/src/common/cmdproc.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/cmdproc.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_USE_GUI_1@monodll_cmndata.o: $(srcdir)/src/common/cmndata.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/cmndata.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_USE_GUI_1@monodll_containr.o: $(srcdir)/src/common/containr.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/containr.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_USE_GUI_1@monodll_cshelp.o: $(srcdir)/src/common/cshelp.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/cshelp.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_USE_GUI_1@monodll_ctrlcmn.o: $(srcdir)/src/common/ctrlcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/ctrlcmn.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_USE_GUI_1@monodll_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/ctrlsub.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_USE_GUI_1@monodll_datacmn.o: $(srcdir)/src/common/datacmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/datacmn.cpp
-@COND_USE_GUI_1_WXUNIV_1@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_USE_GUI_1@monodll_dcbase.o: $(srcdir)/src/common/dcbase.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dcbase.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_USE_GUI_1@monodll_dcbufcmn.o: $(srcdir)/src/common/dcbufcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dcbufcmn.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_USE_GUI_1@monodll_dcgraph.o: $(srcdir)/src/common/dcgraph.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dcgraph.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_USE_GUI_1@monodll_dcsvg.o: $(srcdir)/src/common/dcsvg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dcsvg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_USE_GUI_1@monodll_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dlgcmn.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_USE_GUI_1@monodll_dndcmn.o: $(srcdir)/src/common/dndcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dndcmn.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_USE_GUI_1@monodll_dobjcmn.o: $(srcdir)/src/common/dobjcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dobjcmn.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_USE_GUI_1@monodll_docmdi.o: $(srcdir)/src/common/docmdi.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/docmdi.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_USE_GUI_1@monodll_docview.o: $(srcdir)/src/common/docview.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/docview.cpp
-@COND_USE_GUI_1_WXUNIV_1@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_USE_GUI_1@monodll_dpycmn.o: $(srcdir)/src/common/dpycmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dpycmn.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
+@COND_USE_GUI_1@monodll_dseldlg.o: $(srcdir)/src/common/dseldlg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dseldlg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
+@COND_USE_GUI_1@monodll_effects.o: $(srcdir)/src/common/effects.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/effects.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
+@COND_USE_GUI_1@monodll_fddlgcmn.o: $(srcdir)/src/common/fddlgcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fddlgcmn.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
+@COND_USE_GUI_1@monodll_filectrlcmn.o: $(srcdir)/src/common/filectrlcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/filectrlcmn.cpp
-@COND_USE_GUI_1_WXUNIV_1@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
+@COND_USE_GUI_1@monodll_filepickercmn.o: $(srcdir)/src/common/filepickercmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/filepickercmn.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
+@COND_USE_GUI_1@monodll_fontpickercmn.o: $(srcdir)/src/common/fontpickercmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontpickercmn.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
+@COND_USE_GUI_1@monodll_fldlgcmn.o: $(srcdir)/src/common/fldlgcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fldlgcmn.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
+@COND_USE_GUI_1@monodll_fontcmn.o: $(srcdir)/src/common/fontcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontcmn.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
+@COND_USE_GUI_1@monodll_fontenumcmn.o: $(srcdir)/src/common/fontenumcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontenumcmn.cpp
-@COND_USE_GUI_1_WXUNIV_1@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
+@COND_USE_GUI_1@monodll_fontmap.o: $(srcdir)/src/common/fontmap.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontmap.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
+@COND_USE_GUI_1@monodll_fontutilcmn.o: $(srcdir)/src/common/fontutilcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontutilcmn.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
+@COND_USE_GUI_1@monodll_framecmn.o: $(srcdir)/src/common/framecmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/framecmn.cpp
-@COND_USE_GUI_1_WXUNIV_1@monodll_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
+@COND_USE_GUI_1@monodll_gaugecmn.o: $(srcdir)/src/common/gaugecmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/gaugecmn.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_USE_GUI_1@monodll_gbsizer.o: $(srcdir)/src/common/gbsizer.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/gbsizer.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_USE_GUI_1@monodll_gdicmn.o: $(srcdir)/src/common/gdicmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/gdicmn.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_USE_GUI_1@monodll_geometry.o: $(srcdir)/src/common/geometry.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/geometry.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_USE_GUI_1@monodll_gifdecod.o: $(srcdir)/src/common/gifdecod.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/gifdecod.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_USE_GUI_1@monodll_graphcmn.o: $(srcdir)/src/common/graphcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/graphcmn.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_USE_GUI_1@monodll_helpbase.o: $(srcdir)/src/common/helpbase.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/helpbase.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_USE_GUI_1@monodll_iconbndl.o: $(srcdir)/src/common/iconbndl.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/iconbndl.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_USE_GUI_1@monodll_imagall.o: $(srcdir)/src/common/imagall.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagall.cpp
-@COND_USE_GUI_1_WXUNIV_1@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_USE_GUI_1@monodll_imagbmp.o: $(srcdir)/src/common/imagbmp.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagbmp.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/menuitem.cpp
+@COND_USE_GUI_1@monodll_image.o: $(srcdir)/src/common/image.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/image.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_menuitem.o: $(srcdir)/src/msw/menuitem.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/menuitem.cpp
+@COND_USE_GUI_1@monodll_imagfill.o: $(srcdir)/src/common/imagfill.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagfill.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_menuitem.o: $(srcdir)/src/msw/menuitem.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/menuitem.cpp
+@COND_USE_GUI_1@monodll_imaggif.o: $(srcdir)/src/common/imaggif.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imaggif.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_menuitem.o: $(srcdir)/src/osx/carbon/menuitem.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/menuitem.cpp
+@COND_USE_GUI_1@monodll_imagiff.o: $(srcdir)/src/common/imagiff.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagiff.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_menuitem.o: $(srcdir)/src/osx/cocoa/menuitem.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/menuitem.mm
+@COND_USE_GUI_1@monodll_imagjpeg.o: $(srcdir)/src/common/imagjpeg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagjpeg.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_menuitem.o: $(srcdir)/src/cocoa/menuitem.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/menuitem.mm
+@COND_USE_GUI_1@monodll_imagpcx.o: $(srcdir)/src/common/imagpcx.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagpcx.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_menuitem.o: $(srcdir)/src/os2/menuitem.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/menuitem.cpp
+@COND_USE_GUI_1@monodll_imagpng.o: $(srcdir)/src/common/imagpng.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagpng.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_toolbar.o: $(srcdir)/src/motif/toolbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/toolbar.cpp
+@COND_USE_GUI_1@monodll_imagpnm.o: $(srcdir)/src/common/imagpnm.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagpnm.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
+@COND_USE_GUI_1@monodll_imagtga.o: $(srcdir)/src/common/imagtga.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagtga.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
+@COND_USE_GUI_1@monodll_imagtiff.o: $(srcdir)/src/common/imagtiff.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagtiff.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_toolbar.o: $(srcdir)/src/osx/carbon/toolbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/toolbar.cpp
+@COND_USE_GUI_1@monodll_imagxpm.o: $(srcdir)/src/common/imagxpm.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagxpm.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_toolbar.o: $(srcdir)/src/osx/cocoa/toolbar.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/toolbar.mm
+@COND_USE_GUI_1@monodll_layout.o: $(srcdir)/src/common/layout.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/layout.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_toolbar.o: $(srcdir)/src/cocoa/toolbar.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/toolbar.mm
+@COND_USE_GUI_1@monodll_lboxcmn.o: $(srcdir)/src/common/lboxcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/lboxcmn.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_toolbar.o: $(srcdir)/src/os2/toolbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/toolbar.cpp
+@COND_USE_GUI_1@monodll_listctrlcmn.o: $(srcdir)/src/common/listctrlcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/listctrlcmn.cpp
-@COND_USE_GUI_1_WXUNIV_1@monodll_toolbar.o: $(srcdir)/src/univ/toolbar.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/toolbar.cpp
+@COND_USE_GUI_1@monodll_matrix.o: $(srcdir)/src/common/matrix.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/matrix.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_combo.o: $(srcdir)/src/msw/combo.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/combo.cpp
+@COND_USE_GUI_1@monodll_menucmn.o: $(srcdir)/src/common/menucmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/menucmn.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_combo.o: $(srcdir)/src/msw/combo.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/combo.cpp
+@COND_USE_GUI_1@monodll_nbkbase.o: $(srcdir)/src/common/nbkbase.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/nbkbase.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
+@COND_USE_GUI_1@monodll_overlaycmn.o: $(srcdir)/src/common/overlaycmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/overlaycmn.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
+@COND_USE_GUI_1@monodll_paper.o: $(srcdir)/src/common/paper.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/paper.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
+@COND_USE_GUI_1@monodll_pickerbase.o: $(srcdir)/src/common/pickerbase.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/pickerbase.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
+@COND_USE_GUI_1@monodll_popupcmn.o: $(srcdir)/src/common/popupcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/popupcmn.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_iniconf.o: $(srcdir)/src/os2/iniconf.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/iniconf.cpp
+@COND_USE_GUI_1@monodll_prntbase.o: $(srcdir)/src/common/prntbase.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/prntbase.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_metafile.o: $(srcdir)/src/msw/metafile.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/metafile.cpp
+@COND_USE_GUI_1@monodll_quantize.o: $(srcdir)/src/common/quantize.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/quantize.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_metafile.o: $(srcdir)/src/msw/metafile.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/metafile.cpp
+@COND_USE_GUI_1@monodll_radiocmn.o: $(srcdir)/src/common/radiocmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/radiocmn.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
+@COND_USE_GUI_1@monodll_rendcmn.o: $(srcdir)/src/common/rendcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/rendcmn.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
+@COND_USE_GUI_1@monodll_rgncmn.o: $(srcdir)/src/common/rgncmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/rgncmn.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_metafile.o: $(srcdir)/src/os2/metafile.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/metafile.cpp
+@COND_USE_GUI_1@monodll_settcmn.o: $(srcdir)/src/common/settcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/settcmn.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp
+@COND_USE_GUI_1@monodll_sizer.o: $(srcdir)/src/common/sizer.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/sizer.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_nativdlg.o: $(srcdir)/src/os2/nativdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/nativdlg.cpp
+@COND_USE_GUI_1@monodll_srchcmn.o: $(srcdir)/src/common/srchcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/srchcmn.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_access.o: $(srcdir)/src/msw/ole/access.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp
+@COND_USE_GUI_1@monodll_statbar.o: $(srcdir)/src/common/statbar.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/statbar.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_access.o: $(srcdir)/src/msw/ole/access.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp
+@COND_USE_GUI_1@monodll_stattextcmn.o: $(srcdir)/src/common/stattextcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/stattextcmn.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp
+@COND_USE_GUI_1@monodll_stockitem.o: $(srcdir)/src/common/stockitem.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/stockitem.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp
+@COND_USE_GUI_1@monodll_tbarbase.o: $(srcdir)/src/common/tbarbase.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/tbarbase.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/ownerdrw.cpp
+@COND_USE_GUI_1@monodll_textcmn.o: $(srcdir)/src/common/textcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/textcmn.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
+@COND_USE_GUI_1@monodll_textentrycmn.o: $(srcdir)/src/common/textentrycmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/textentrycmn.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
+@COND_USE_GUI_1@monodll_toplvcmn.o: $(srcdir)/src/common/toplvcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/toplvcmn.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/tabctrl.cpp
+@COND_USE_GUI_1@monodll_treebase.o: $(srcdir)/src/common/treebase.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/treebase.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/tabctrl.cpp
+@COND_USE_GUI_1@monodll_valgen.o: $(srcdir)/src/common/valgen.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/valgen.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_tabctrl.o: $(srcdir)/src/osx/carbon/tabctrl.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/tabctrl.cpp
+@COND_USE_GUI_1@monodll_validate.o: $(srcdir)/src/common/validate.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/validate.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_tabctrl.o: $(srcdir)/src/osx/carbon/tabctrl.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/tabctrl.cpp
+@COND_USE_GUI_1@monodll_valtext.o: $(srcdir)/src/common/valtext.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/valtext.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_tabctrl.o: $(srcdir)/src/os2/tabctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/tabctrl.cpp
+@COND_USE_GUI_1@monodll_wincmn.o: $(srcdir)/src/common/wincmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/wincmn.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp
+@COND_USE_GUI_1@monodll_windowid.o: $(srcdir)/src/common/windowid.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/windowid.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp
+@COND_USE_GUI_1@monodll_wrapsizer.o: $(srcdir)/src/common/wrapsizer.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/wrapsizer.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
+@COND_USE_GUI_1@monodll_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/xpmdecod.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
+@COND_USE_GUI_1@monodll_busyinfo.o: $(srcdir)/src/generic/busyinfo.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/busyinfo.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
+@COND_USE_GUI_1@monodll_buttonbar.o: $(srcdir)/src/generic/buttonbar.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/buttonbar.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
+@COND_USE_GUI_1@monodll_choicdgg.o: $(srcdir)/src/generic/choicdgg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/choicdgg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_glgrab.o: $(srcdir)/src/osx/core/glgrab.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/glgrab.cpp
+@COND_USE_GUI_1@monodll_choicbkg.o: $(srcdir)/src/generic/choicbkg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/choicbkg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_glgrab.o: $(srcdir)/src/osx/core/glgrab.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/glgrab.cpp
+@COND_USE_GUI_1@monodll_combog.o: $(srcdir)/src/generic/combog.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/combog.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
+@COND_USE_GUI_1@monodll_dcpsg.o: $(srcdir)/src/generic/dcpsg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dcpsg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
+@COND_USE_GUI_1@monodll_dirctrlg.o: $(srcdir)/src/generic/dirctrlg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dirctrlg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
+@COND_USE_GUI_1@monodll_dragimgg.o: $(srcdir)/src/generic/dragimgg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dragimgg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
+@COND_USE_GUI_1@monodll_filectrlg.o: $(srcdir)/src/generic/filectrlg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filectrlg.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_srchctrl.o: $(srcdir)/src/osx/carbon/srchctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/srchctrl.cpp
+@COND_USE_GUI_1@monodll_listbkg.o: $(srcdir)/src/generic/listbkg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listbkg.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_srchctrl.o: $(srcdir)/src/osx/cocoa/srchctrl.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/srchctrl.mm
+@COND_USE_GUI_1@monodll_logg.o: $(srcdir)/src/generic/logg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/logg.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_regiong.o: $(srcdir)/src/generic/regiong.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp
+@COND_USE_GUI_1@monodll_numdlgg.o: $(srcdir)/src/generic/numdlgg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/numdlgg.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_regiong.o: $(srcdir)/src/generic/regiong.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp
+@COND_USE_GUI_1@monodll_panelg.o: $(srcdir)/src/generic/panelg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/panelg.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_drawer.o: $(srcdir)/src/cocoa/drawer.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/drawer.mm
+@COND_USE_GUI_1@monodll_progdlgg.o: $(srcdir)/src/generic/progdlgg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/progdlgg.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_drawer.o: $(srcdir)/src/osx/carbon/drawer.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/drawer.cpp
+@COND_USE_GUI_1@monodll_printps.o: $(srcdir)/src/generic/printps.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/printps.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_sound.o: $(srcdir)/src/cocoa/sound.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/sound.mm
+@COND_USE_GUI_1@monodll_renderg.o: $(srcdir)/src/generic/renderg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/renderg.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_sound.o: $(srcdir)/src/msw/sound.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/sound.cpp
+@COND_USE_GUI_1@monodll_scrlwing.o: $(srcdir)/src/generic/scrlwing.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/scrlwing.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_sound.o: $(srcdir)/src/msw/sound.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/sound.cpp
+@COND_USE_GUI_1@monodll_selstore.o: $(srcdir)/src/generic/selstore.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/selstore.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_sound.o: $(srcdir)/src/osx/carbon/sound.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/sound.cpp
+@COND_USE_GUI_1@monodll_spinctlg.o: $(srcdir)/src/generic/spinctlg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/spinctlg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+@COND_USE_GUI_1@monodll_splitter.o: $(srcdir)/src/generic/splitter.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/splitter.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+@COND_USE_GUI_1@monodll_srchctlg.o: $(srcdir)/src/generic/srchctlg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/srchctlg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+@COND_USE_GUI_1@monodll_statbmpg.o: $(srcdir)/src/generic/statbmpg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statbmpg.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+@COND_USE_GUI_1@monodll_textdlgg.o: $(srcdir)/src/generic/textdlgg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/textdlgg.cpp
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monodll_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+@COND_USE_GUI_1@monodll_tipwin.o: $(srcdir)/src/generic/tipwin.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/tipwin.cpp
-@COND_TOOLKIT_PM_USE_GUI_1@monodll_sound.o: $(srcdir)/src/os2/sound.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/sound.cpp
+@COND_USE_GUI_1@monodll_toolbkg.o: $(srcdir)/src/generic/toolbkg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/toolbkg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
+@COND_USE_GUI_1@monodll_treectlg.o: $(srcdir)/src/generic/treectlg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/treectlg.cpp
-@COND_USE_GUI_1_WXUNIV_1@monodll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
+@COND_USE_GUI_1@monodll_treebkg.o: $(srcdir)/src/generic/treebkg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/treebkg.cpp
-@COND_USE_GUI_1@monodll_accelcmn.o: $(srcdir)/src/common/accelcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/accelcmn.cpp
+@COND_USE_GUI_1@monodll_vlbox.o: $(srcdir)/src/generic/vlbox.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/vlbox.cpp
-@COND_USE_GUI_1@monodll_accesscmn.o: $(srcdir)/src/common/accesscmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/accesscmn.cpp
+@COND_USE_GUI_1@monodll_vscroll.o: $(srcdir)/src/generic/vscroll.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/vscroll.cpp
-@COND_USE_GUI_1@monodll_anidecod.o: $(srcdir)/src/common/anidecod.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/anidecod.cpp
+@COND_USE_GUI_1@monodll_animatecmn.o: $(srcdir)/src/common/animatecmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/animatecmn.cpp
-@COND_USE_GUI_1@monodll_appcmn.o: $(srcdir)/src/common/appcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/appcmn.cpp
+@COND_USE_GUI_1@monodll_bmpcboxcmn.o: $(srcdir)/src/common/bmpcboxcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/bmpcboxcmn.cpp
-@COND_USE_GUI_1@monodll_artprov.o: $(srcdir)/src/common/artprov.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/artprov.cpp
+@COND_USE_GUI_1@monodll_calctrlcmn.o: $(srcdir)/src/common/calctrlcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/calctrlcmn.cpp
-@COND_USE_GUI_1@monodll_artstd.o: $(srcdir)/src/common/artstd.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/artstd.cpp
+@COND_USE_GUI_1@monodll_datavcmn.o: $(srcdir)/src/common/datavcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/datavcmn.cpp
-@COND_USE_GUI_1@monodll_bmpbase.o: $(srcdir)/src/common/bmpbase.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/bmpbase.cpp
+@COND_USE_GUI_1@monodll_hyperlnkcmn.o: $(srcdir)/src/common/hyperlnkcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/hyperlnkcmn.cpp
-@COND_USE_GUI_1@monodll_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/bookctrl.cpp
+@COND_USE_GUI_1@monodll_aboutdlgg.o: $(srcdir)/src/generic/aboutdlgg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/aboutdlgg.cpp
-@COND_USE_GUI_1@monodll_btncmn.o: $(srcdir)/src/common/btncmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/btncmn.cpp
+@COND_USE_GUI_1@monodll_bmpcboxg.o: $(srcdir)/src/generic/bmpcboxg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/bmpcboxg.cpp
-@COND_USE_GUI_1@monodll_cairo.o: $(srcdir)/src/common/cairo.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/cairo.cpp
+@COND_USE_GUI_1@monodll_calctrlg.o: $(srcdir)/src/generic/calctrlg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/calctrlg.cpp
-@COND_USE_GUI_1@monodll_choiccmn.o: $(srcdir)/src/common/choiccmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/choiccmn.cpp
+@COND_USE_GUI_1@monodll_datavgen.o: $(srcdir)/src/generic/datavgen.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/datavgen.cpp
-@COND_USE_GUI_1@monodll_clipcmn.o: $(srcdir)/src/common/clipcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/clipcmn.cpp
+@COND_USE_GUI_1@monodll_datectlg.o: $(srcdir)/src/generic/datectlg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/datectlg.cpp
-@COND_USE_GUI_1@monodll_clrpickercmn.o: $(srcdir)/src/common/clrpickercmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/clrpickercmn.cpp
+@COND_USE_GUI_1@monodll_editlbox.o: $(srcdir)/src/generic/editlbox.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/editlbox.cpp
-@COND_USE_GUI_1@monodll_colourcmn.o: $(srcdir)/src/common/colourcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/colourcmn.cpp
+@COND_USE_GUI_1@monodll_grid.o: $(srcdir)/src/generic/grid.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/grid.cpp
-@COND_USE_GUI_1@monodll_combocmn.o: $(srcdir)/src/common/combocmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/combocmn.cpp
+@COND_USE_GUI_1@monodll_gridctrl.o: $(srcdir)/src/generic/gridctrl.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/gridctrl.cpp
-@COND_USE_GUI_1@monodll_cmdproc.o: $(srcdir)/src/common/cmdproc.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/cmdproc.cpp
+@COND_USE_GUI_1@monodll_gridsel.o: $(srcdir)/src/generic/gridsel.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/gridsel.cpp
-@COND_USE_GUI_1@monodll_cmndata.o: $(srcdir)/src/common/cmndata.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/cmndata.cpp
+@COND_USE_GUI_1@monodll_helpext.o: $(srcdir)/src/generic/helpext.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/helpext.cpp
-@COND_USE_GUI_1@monodll_containr.o: $(srcdir)/src/common/containr.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/containr.cpp
+@COND_USE_GUI_1@monodll_hyperlinkg.o: $(srcdir)/src/generic/hyperlinkg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/hyperlinkg.cpp
-@COND_USE_GUI_1@monodll_cshelp.o: $(srcdir)/src/common/cshelp.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/cshelp.cpp
+@COND_USE_GUI_1@monodll_laywin.o: $(srcdir)/src/generic/laywin.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/laywin.cpp
-@COND_USE_GUI_1@monodll_ctrlcmn.o: $(srcdir)/src/common/ctrlcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/ctrlcmn.cpp
+@COND_USE_GUI_1@monodll_notifmsgg.o: $(srcdir)/src/generic/notifmsgg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/notifmsgg.cpp
-@COND_USE_GUI_1@monodll_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/ctrlsub.cpp
+@COND_USE_GUI_1@monodll_odcombo.o: $(srcdir)/src/generic/odcombo.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/odcombo.cpp
-@COND_USE_GUI_1@monodll_datacmn.o: $(srcdir)/src/common/datacmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/datacmn.cpp
+@COND_USE_GUI_1@monodll_propdlg.o: $(srcdir)/src/generic/propdlg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/propdlg.cpp
-@COND_USE_GUI_1@monodll_dcbase.o: $(srcdir)/src/common/dcbase.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dcbase.cpp
+@COND_USE_GUI_1@monodll_sashwin.o: $(srcdir)/src/generic/sashwin.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/sashwin.cpp
-@COND_USE_GUI_1@monodll_dcbufcmn.o: $(srcdir)/src/common/dcbufcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dcbufcmn.cpp
+@COND_USE_GUI_1@monodll_splash.o: $(srcdir)/src/generic/splash.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/splash.cpp
-@COND_USE_GUI_1@monodll_dcgraph.o: $(srcdir)/src/common/dcgraph.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dcgraph.cpp
+@COND_USE_GUI_1@monodll_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/tipdlg.cpp
-@COND_USE_GUI_1@monodll_dcsvg.o: $(srcdir)/src/common/dcsvg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dcsvg.cpp
+@COND_USE_GUI_1@monodll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/wizard.cpp
-@COND_USE_GUI_1@monodll_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dlgcmn.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-@COND_USE_GUI_1@monodll_dndcmn.o: $(srcdir)/src/common/dndcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dndcmn.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-@COND_USE_GUI_1@monodll_dobjcmn.o: $(srcdir)/src/common/dobjcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dobjcmn.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-@COND_USE_GUI_1@monodll_docmdi.o: $(srcdir)/src/common/docmdi.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/docmdi.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-@COND_USE_GUI_1@monodll_docview.o: $(srcdir)/src/common/docview.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/docview.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-@COND_USE_GUI_1@monodll_dpycmn.o: $(srcdir)/src/common/dpycmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dpycmn.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-@COND_USE_GUI_1@monodll_dseldlg.o: $(srcdir)/src/common/dseldlg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dseldlg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-@COND_USE_GUI_1@monodll_effects.o: $(srcdir)/src/common/effects.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/effects.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-@COND_USE_GUI_1@monodll_fddlgcmn.o: $(srcdir)/src/common/fddlgcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fddlgcmn.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-@COND_USE_GUI_1@monodll_filectrlcmn.o: $(srcdir)/src/common/filectrlcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/filectrlcmn.cpp
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-@COND_USE_GUI_1@monodll_filepickercmn.o: $(srcdir)/src/common/filepickercmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/filepickercmn.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-@COND_USE_GUI_1@monodll_fontpickercmn.o: $(srcdir)/src/common/fontpickercmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontpickercmn.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-@COND_USE_GUI_1@monodll_fldlgcmn.o: $(srcdir)/src/common/fldlgcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fldlgcmn.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-@COND_USE_GUI_1@monodll_fontcmn.o: $(srcdir)/src/common/fontcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontcmn.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-@COND_USE_GUI_1@monodll_fontenumcmn.o: $(srcdir)/src/common/fontenumcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontenumcmn.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-@COND_USE_GUI_1@monodll_fontmap.o: $(srcdir)/src/common/fontmap.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontmap.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-@COND_USE_GUI_1@monodll_fontutilcmn.o: $(srcdir)/src/common/fontutilcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontutilcmn.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-@COND_USE_GUI_1@monodll_framecmn.o: $(srcdir)/src/common/framecmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/framecmn.cpp
+@COND_TOOLKIT_PM_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-@COND_USE_GUI_1@monodll_gaugecmn.o: $(srcdir)/src/common/gaugecmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/gaugecmn.cpp
+@COND_USE_GUI_1_WXUNIV_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-@COND_USE_GUI_1@monodll_gbsizer.o: $(srcdir)/src/common/gbsizer.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/gbsizer.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
-@COND_USE_GUI_1@monodll_gdicmn.o: $(srcdir)/src/common/gdicmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/gdicmn.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
-@COND_USE_GUI_1@monodll_geometry.o: $(srcdir)/src/common/geometry.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/geometry.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
-@COND_USE_GUI_1@monodll_gifdecod.o: $(srcdir)/src/common/gifdecod.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/gifdecod.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
-@COND_USE_GUI_1@monodll_graphcmn.o: $(srcdir)/src/common/graphcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/graphcmn.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_sound.o: $(srcdir)/src/msw/sound.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/sound.cpp
-@COND_USE_GUI_1@monodll_helpbase.o: $(srcdir)/src/common/helpbase.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/helpbase.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_sound.o: $(srcdir)/src/msw/sound.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/sound.cpp
-@COND_USE_GUI_1@monodll_iconbndl.o: $(srcdir)/src/common/iconbndl.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/iconbndl.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/taskbar.cpp
-@COND_USE_GUI_1@monodll_imagall.o: $(srcdir)/src/common/imagall.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagall.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/taskbar.cpp
-@COND_USE_GUI_1@monodll_imagbmp.o: $(srcdir)/src/common/imagbmp.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagbmp.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_joystick.o: $(srcdir)/src/msw/joystick.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/joystick.cpp
-@COND_USE_GUI_1@monodll_image.o: $(srcdir)/src/common/image.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/image.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_carbon_aboutdlg.o: $(srcdir)/src/osx/carbon/aboutdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/aboutdlg.cpp
-@COND_USE_GUI_1@monodll_imagfill.o: $(srcdir)/src/common/imagfill.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagfill.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_carbon_drawer.o: $(srcdir)/src/osx/carbon/drawer.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/drawer.cpp
-@COND_USE_GUI_1@monodll_imaggif.o: $(srcdir)/src/common/imaggif.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imaggif.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_carbon_dataview.o: $(srcdir)/src/osx/carbon/dataview.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dataview.cpp
-@COND_USE_GUI_1@monodll_imagiff.o: $(srcdir)/src/common/imagiff.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagiff.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_databrow.o: $(srcdir)/src/osx/carbon/databrow.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/databrow.cpp
-@COND_USE_GUI_1@monodll_imagjpeg.o: $(srcdir)/src/common/imagjpeg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagjpeg.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_carbon_sound.o: $(srcdir)/src/osx/carbon/sound.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/sound.cpp
-@COND_USE_GUI_1@monodll_imagpcx.o: $(srcdir)/src/common/imagpcx.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagpcx.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_carbon_taskbar.o: $(srcdir)/src/osx/carbon/taskbar.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/taskbar.cpp
-@COND_USE_GUI_1@monodll_imagpng.o: $(srcdir)/src/common/imagpng.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagpng.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
-@COND_USE_GUI_1@monodll_imagpnm.o: $(srcdir)/src/common/imagpnm.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagpnm.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
-@COND_USE_GUI_1@monodll_imagtga.o: $(srcdir)/src/common/imagtga.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagtga.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1@monodll_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
-@COND_USE_GUI_1@monodll_imagtiff.o: $(srcdir)/src/common/imagtiff.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagtiff.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_cocoa_aboutdlg.o: $(srcdir)/src/osx/cocoa/aboutdlg.mm $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/aboutdlg.mm
-@COND_USE_GUI_1@monodll_imagxpm.o: $(srcdir)/src/common/imagxpm.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagxpm.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_osx_cocoa_taskbar.o: $(srcdir)/src/osx/cocoa/taskbar.mm $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/taskbar.mm
-@COND_USE_GUI_1@monodll_layout.o: $(srcdir)/src/common/layout.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/layout.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1@monodll_src_cocoa_taskbar.o: $(srcdir)/src/cocoa/taskbar.mm $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/taskbar.mm
-@COND_USE_GUI_1@monodll_lboxcmn.o: $(srcdir)/src/common/lboxcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/lboxcmn.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-@COND_USE_GUI_1@monodll_listctrlcmn.o: $(srcdir)/src/common/listctrlcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/listctrlcmn.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-@COND_USE_GUI_1@monodll_matrix.o: $(srcdir)/src/common/matrix.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/matrix.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-@COND_USE_GUI_1@monodll_menucmn.o: $(srcdir)/src/common/menucmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/menucmn.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-@COND_USE_GUI_1@monodll_nbkbase.o: $(srcdir)/src/common/nbkbase.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/nbkbase.cpp
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monodll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-@COND_USE_GUI_1@monodll_overlaycmn.o: $(srcdir)/src/common/overlaycmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/overlaycmn.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
-@COND_USE_GUI_1@monodll_paper.o: $(srcdir)/src/common/paper.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/paper.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
-@COND_USE_GUI_1@monodll_pickerbase.o: $(srcdir)/src/common/pickerbase.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/pickerbase.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
-@COND_USE_GUI_1@monodll_popupcmn.o: $(srcdir)/src/common/popupcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/popupcmn.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
-@COND_USE_GUI_1@monodll_prntbase.o: $(srcdir)/src/common/prntbase.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/prntbase.cpp
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monodll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
-@COND_USE_GUI_1@monodll_quantize.o: $(srcdir)/src/common/quantize.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/quantize.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
-@COND_USE_GUI_1@monodll_radiocmn.o: $(srcdir)/src/common/radiocmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/radiocmn.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
-@COND_USE_GUI_1@monodll_rendcmn.o: $(srcdir)/src/common/rendcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/rendcmn.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
-@COND_USE_GUI_1@monodll_rgncmn.o: $(srcdir)/src/common/rgncmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/rgncmn.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
-@COND_USE_GUI_1@monodll_settcmn.o: $(srcdir)/src/common/settcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/settcmn.cpp
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
-@COND_USE_GUI_1@monodll_sizer.o: $(srcdir)/src/common/sizer.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/sizer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_taskbar.o: $(srcdir)/src/gtk/taskbar.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/taskbar.cpp
-@COND_USE_GUI_1@monodll_srchcmn.o: $(srcdir)/src/common/srchcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/srchcmn.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/gtk/eggtrayicon.c
-@COND_USE_GUI_1@monodll_statbar.o: $(srcdir)/src/common/statbar.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/statbar.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_hildon_notifmsg.o: $(srcdir)/src/gtk/hildon/notifmsg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/hildon/notifmsg.cpp
-@COND_USE_GUI_1@monodll_stattextcmn.o: $(srcdir)/src/common/stattextcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/stattextcmn.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_eggtrayicon.o: $(srcdir)/src/gtk1/eggtrayicon.c $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/gtk1/eggtrayicon.c
-@COND_USE_GUI_1@monodll_stockitem.o: $(srcdir)/src/common/stockitem.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/stockitem.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_taskbar.o: $(srcdir)/src/gtk1/taskbar.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/taskbar.cpp
-@COND_USE_GUI_1@monodll_tbarbase.o: $(srcdir)/src/common/tbarbase.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/tbarbase.cpp
+@COND_TOOLKIT_PM_USE_GUI_1@monodll_os2_joystick.o: $(srcdir)/src/os2/joystick.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/joystick.cpp
-@COND_USE_GUI_1@monodll_textcmn.o: $(srcdir)/src/common/textcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/textcmn.cpp
+@COND_TOOLKIT_PM_USE_GUI_1@monodll_os2_sound.o: $(srcdir)/src/os2/sound.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/sound.cpp
-@COND_USE_GUI_1@monodll_textentrycmn.o: $(srcdir)/src/common/textentrycmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/textentrycmn.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_bmpcbox.o: $(srcdir)/src/msw/bmpcbox.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/bmpcbox.cpp
-@COND_USE_GUI_1@monodll_toplvcmn.o: $(srcdir)/src/common/toplvcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/toplvcmn.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_bmpcbox.o: $(srcdir)/src/msw/bmpcbox.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/bmpcbox.cpp
-@COND_USE_GUI_1@monodll_treebase.o: $(srcdir)/src/common/treebase.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/treebase.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
-@COND_USE_GUI_1@monodll_valgen.o: $(srcdir)/src/common/valgen.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/valgen.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
-@COND_USE_GUI_1@monodll_validate.o: $(srcdir)/src/common/validate.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/validate.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/datecontrols.cpp
-@COND_USE_GUI_1@monodll_valtext.o: $(srcdir)/src/common/valtext.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/valtext.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/datecontrols.cpp
-@COND_USE_GUI_1@monodll_wincmn.o: $(srcdir)/src/common/wincmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/wincmn.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp
-@COND_USE_GUI_1@monodll_windowid.o: $(srcdir)/src/common/windowid.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/windowid.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp
-@COND_USE_GUI_1@monodll_wrapsizer.o: $(srcdir)/src/common/wrapsizer.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/wrapsizer.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_mediactrl_am.o: $(srcdir)/src/msw/mediactrl_am.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_am.cpp
-@COND_USE_GUI_1@monodll_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/xpmdecod.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_mediactrl_am.o: $(srcdir)/src/msw/mediactrl_am.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_am.cpp
-@COND_USE_GUI_1@monodll_busyinfo.o: $(srcdir)/src/generic/busyinfo.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/busyinfo.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_mediactrl_wmp10.o: $(srcdir)/src/msw/mediactrl_wmp10.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_wmp10.cpp
-@COND_USE_GUI_1@monodll_buttonbar.o: $(srcdir)/src/generic/buttonbar.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/buttonbar.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_mediactrl_wmp10.o: $(srcdir)/src/msw/mediactrl_wmp10.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_wmp10.cpp
-@COND_USE_GUI_1@monodll_choicdgg.o: $(srcdir)/src/generic/choicdgg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/choicdgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_mediactrl_qt.o: $(srcdir)/src/msw/mediactrl_qt.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_qt.cpp
-@COND_USE_GUI_1@monodll_choicbkg.o: $(srcdir)/src/generic/choicbkg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/choicbkg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_mediactrl_qt.o: $(srcdir)/src/msw/mediactrl_qt.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_qt.cpp
-@COND_USE_GUI_1@monodll_combog.o: $(srcdir)/src/generic/combog.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/combog.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
-@COND_USE_GUI_1@monodll_dcpsg.o: $(srcdir)/src/generic/dcpsg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dcpsg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
-@COND_USE_GUI_1@monodll_dirctrlg.o: $(srcdir)/src/generic/dirctrlg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dirctrlg.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
-@COND_USE_GUI_1@monodll_dragimgg.o: $(srcdir)/src/generic/dragimgg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dragimgg.cpp
+@COND_TOOLKIT_GTK_USE_GUI_1@monodll_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
-@COND_USE_GUI_1@monodll_filectrlg.o: $(srcdir)/src/generic/filectrlg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filectrlg.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
-@COND_USE_GUI_1@monodll_listbkg.o: $(srcdir)/src/generic/listbkg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listbkg.cpp
+@COND_PLATFORM_UNIX_1_USE_GUI_1@monodll_chm.o: $(srcdir)/src/html/chm.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/chm.cpp
-@COND_USE_GUI_1@monodll_logg.o: $(srcdir)/src/generic/logg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/logg.cpp
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@monodll_chm.o: $(srcdir)/src/html/chm.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/chm.cpp
-@COND_USE_GUI_1@monodll_numdlgg.o: $(srcdir)/src/generic/numdlgg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/numdlgg.cpp
+monodll_version_rc.o: $(srcdir)/src/msw/version.rc $(MONODLL_ODEP)
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_BASE=1 --define WXMAKINGDLL --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS
-@COND_USE_GUI_1@monodll_panelg.o: $(srcdir)/src/generic/panelg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/panelg.cpp
+monolib_appbase.o: $(srcdir)/src/common/appbase.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/appbase.cpp
-@COND_USE_GUI_1@monodll_progdlgg.o: $(srcdir)/src/generic/progdlgg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/progdlgg.cpp
+monolib_arcall.o: $(srcdir)/src/common/arcall.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/arcall.cpp
-@COND_USE_GUI_1@monodll_printps.o: $(srcdir)/src/generic/printps.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/printps.cpp
+monolib_arcfind.o: $(srcdir)/src/common/arcfind.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/arcfind.cpp
-@COND_USE_GUI_1@monodll_renderg.o: $(srcdir)/src/generic/renderg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/renderg.cpp
+monolib_archive.o: $(srcdir)/src/common/archive.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/archive.cpp
-@COND_USE_GUI_1@monodll_scrlwing.o: $(srcdir)/src/generic/scrlwing.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/scrlwing.cpp
+monolib_arrstr.o: $(srcdir)/src/common/arrstr.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/arrstr.cpp
-@COND_USE_GUI_1@monodll_selstore.o: $(srcdir)/src/generic/selstore.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/selstore.cpp
+monolib_base64.o: $(srcdir)/src/common/base64.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/base64.cpp
-@COND_USE_GUI_1@monodll_spinctlg.o: $(srcdir)/src/generic/spinctlg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/spinctlg.cpp
+monolib_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/clntdata.cpp
-@COND_USE_GUI_1@monodll_splitter.o: $(srcdir)/src/generic/splitter.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/splitter.cpp
+monolib_cmdline.o: $(srcdir)/src/common/cmdline.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/cmdline.cpp
-@COND_USE_GUI_1@monodll_srchctlg.o: $(srcdir)/src/generic/srchctlg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/srchctlg.cpp
+monolib_config.o: $(srcdir)/src/common/config.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/config.cpp
-@COND_USE_GUI_1@monodll_statbmpg.o: $(srcdir)/src/generic/statbmpg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statbmpg.cpp
+monolib_convauto.o: $(srcdir)/src/common/convauto.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/convauto.cpp
-@COND_USE_GUI_1@monodll_textdlgg.o: $(srcdir)/src/generic/textdlgg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/textdlgg.cpp
+monolib_datetime.o: $(srcdir)/src/common/datetime.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/datetime.cpp
-@COND_USE_GUI_1@monodll_tipwin.o: $(srcdir)/src/generic/tipwin.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/tipwin.cpp
+monolib_datstrm.o: $(srcdir)/src/common/datstrm.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/datstrm.cpp
-@COND_USE_GUI_1@monodll_toolbkg.o: $(srcdir)/src/generic/toolbkg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/toolbkg.cpp
+monolib_dircmn.o: $(srcdir)/src/common/dircmn.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dircmn.cpp
-@COND_USE_GUI_1@monodll_treectlg.o: $(srcdir)/src/generic/treectlg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/treectlg.cpp
+monolib_dynarray.o: $(srcdir)/src/common/dynarray.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dynarray.cpp
-@COND_USE_GUI_1@monodll_treebkg.o: $(srcdir)/src/generic/treebkg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/treebkg.cpp
+monolib_dynlib.o: $(srcdir)/src/common/dynlib.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dynlib.cpp
-@COND_USE_GUI_1@monodll_vlbox.o: $(srcdir)/src/generic/vlbox.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/vlbox.cpp
+monolib_dynload.o: $(srcdir)/src/common/dynload.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dynload.cpp
-@COND_USE_GUI_1@monodll_vscroll.o: $(srcdir)/src/generic/vscroll.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/vscroll.cpp
+monolib_encconv.o: $(srcdir)/src/common/encconv.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/encconv.cpp
-@COND_USE_GUI_1@monodll_animatecmn.o: $(srcdir)/src/common/animatecmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/animatecmn.cpp
+monolib_evtloopcmn.o: $(srcdir)/src/common/evtloopcmn.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/evtloopcmn.cpp
-@COND_USE_GUI_1@monodll_bmpcboxcmn.o: $(srcdir)/src/common/bmpcboxcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/bmpcboxcmn.cpp
+monolib_extended.o: $(srcdir)/src/common/extended.c $(MONOLIB_ODEP)
+ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/common/extended.c
-@COND_USE_GUI_1@monodll_calctrlcmn.o: $(srcdir)/src/common/calctrlcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/calctrlcmn.cpp
+monolib_ffile.o: $(srcdir)/src/common/ffile.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/ffile.cpp
-@COND_USE_GUI_1@monodll_datavcmn.o: $(srcdir)/src/common/datavcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/datavcmn.cpp
+monolib_file.o: $(srcdir)/src/common/file.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/file.cpp
-@COND_USE_GUI_1@monodll_hyperlnkcmn.o: $(srcdir)/src/common/hyperlnkcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/hyperlnkcmn.cpp
+monolib_fileback.o: $(srcdir)/src/common/fileback.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fileback.cpp
-@COND_USE_GUI_1@monodll_aboutdlgg.o: $(srcdir)/src/generic/aboutdlgg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/aboutdlgg.cpp
+monolib_fileconf.o: $(srcdir)/src/common/fileconf.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fileconf.cpp
-@COND_USE_GUI_1@monodll_bmpcboxg.o: $(srcdir)/src/generic/bmpcboxg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/bmpcboxg.cpp
+monolib_filefn.o: $(srcdir)/src/common/filefn.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/filefn.cpp
-@COND_USE_GUI_1@monodll_calctrlg.o: $(srcdir)/src/generic/calctrlg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/calctrlg.cpp
+monolib_filename.o: $(srcdir)/src/common/filename.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/filename.cpp
-@COND_USE_GUI_1@monodll_datavgen.o: $(srcdir)/src/generic/datavgen.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/datavgen.cpp
+monolib_filesys.o: $(srcdir)/src/common/filesys.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/filesys.cpp
-@COND_USE_GUI_1@monodll_datectlg.o: $(srcdir)/src/generic/datectlg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/datectlg.cpp
+monolib_filtall.o: $(srcdir)/src/common/filtall.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/filtall.cpp
-@COND_USE_GUI_1@monodll_editlbox.o: $(srcdir)/src/generic/editlbox.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/editlbox.cpp
+monolib_filtfind.o: $(srcdir)/src/common/filtfind.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/filtfind.cpp
-@COND_USE_GUI_1@monodll_grid.o: $(srcdir)/src/generic/grid.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/grid.cpp
+monolib_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fmapbase.cpp
-@COND_USE_GUI_1@monodll_gridctrl.o: $(srcdir)/src/generic/gridctrl.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/gridctrl.cpp
+monolib_fs_arc.o: $(srcdir)/src/common/fs_arc.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fs_arc.cpp
-@COND_USE_GUI_1@monodll_gridsel.o: $(srcdir)/src/generic/gridsel.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/gridsel.cpp
+monolib_fs_filter.o: $(srcdir)/src/common/fs_filter.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fs_filter.cpp
-@COND_USE_GUI_1@monodll_helpext.o: $(srcdir)/src/generic/helpext.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/helpext.cpp
+monolib_hash.o: $(srcdir)/src/common/hash.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/hash.cpp
-@COND_USE_GUI_1@monodll_hyperlinkg.o: $(srcdir)/src/generic/hyperlinkg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/hyperlinkg.cpp
+monolib_hashmap.o: $(srcdir)/src/common/hashmap.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/hashmap.cpp
-@COND_USE_GUI_1@monodll_laywin.o: $(srcdir)/src/generic/laywin.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/laywin.cpp
+monolib_init.o: $(srcdir)/src/common/init.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/init.cpp
-@COND_USE_GUI_1@monodll_notifmsgg.o: $(srcdir)/src/generic/notifmsgg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/notifmsgg.cpp
+monolib_intl.o: $(srcdir)/src/common/intl.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/intl.cpp
-@COND_USE_GUI_1@monodll_odcombo.o: $(srcdir)/src/generic/odcombo.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/odcombo.cpp
+monolib_ipcbase.o: $(srcdir)/src/common/ipcbase.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/ipcbase.cpp
-@COND_USE_GUI_1@monodll_propdlg.o: $(srcdir)/src/generic/propdlg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/propdlg.cpp
+monolib_list.o: $(srcdir)/src/common/list.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/list.cpp
-@COND_USE_GUI_1@monodll_sashwin.o: $(srcdir)/src/generic/sashwin.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/sashwin.cpp
+monolib_log.o: $(srcdir)/src/common/log.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/log.cpp
-@COND_USE_GUI_1@monodll_splash.o: $(srcdir)/src/generic/splash.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/splash.cpp
+monolib_longlong.o: $(srcdir)/src/common/longlong.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/longlong.cpp
-@COND_USE_GUI_1@monodll_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/tipdlg.cpp
+monolib_memory.o: $(srcdir)/src/common/memory.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/memory.cpp
-@COND_USE_GUI_1@monodll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/wizard.cpp
+monolib_mimecmn.o: $(srcdir)/src/common/mimecmn.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/mimecmn.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
+monolib_module.o: $(srcdir)/src/common/module.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/module.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
+monolib_mstream.o: $(srcdir)/src/common/mstream.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/mstream.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
+monolib_object.o: $(srcdir)/src/common/object.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/object.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
+monolib_platinfo.o: $(srcdir)/src/common/platinfo.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/platinfo.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
+monolib_powercmn.o: $(srcdir)/src/common/powercmn.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/powercmn.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
+monolib_process.o: $(srcdir)/src/common/process.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/process.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
+monolib_regex.o: $(srcdir)/src/common/regex.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/regex.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
+monolib_stdpbase.o: $(srcdir)/src/common/stdpbase.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/stdpbase.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
+monolib_sstream.o: $(srcdir)/src/common/sstream.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/sstream.cpp
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
+monolib_stopwatch.o: $(srcdir)/src/common/stopwatch.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/stopwatch.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+monolib_strconv.o: $(srcdir)/src/common/strconv.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/strconv.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+monolib_stream.o: $(srcdir)/src/common/stream.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/stream.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+monolib_string.o: $(srcdir)/src/common/string.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/string.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+monolib_stringimpl.o: $(srcdir)/src/common/stringimpl.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/stringimpl.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+monolib_stringops.o: $(srcdir)/src/common/stringops.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/stringops.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+monolib_strvararg.o: $(srcdir)/src/common/strvararg.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/strvararg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+monolib_sysopt.o: $(srcdir)/src/common/sysopt.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/sysopt.cpp
-@COND_TOOLKIT_PM_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+monolib_tarstrm.o: $(srcdir)/src/common/tarstrm.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/tarstrm.cpp
-@COND_USE_GUI_1_WXUNIV_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+monolib_textbuf.o: $(srcdir)/src/common/textbuf.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/textbuf.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
+monolib_textfile.o: $(srcdir)/src/common/textfile.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/textfile.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
+monolib_timercmn.o: $(srcdir)/src/common/timercmn.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/timercmn.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_aboutdlg.o: $(srcdir)/src/osx/carbon/aboutdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/aboutdlg.cpp
+monolib_timerimpl.o: $(srcdir)/src/common/timerimpl.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/timerimpl.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_aboutdlg.o: $(srcdir)/src/osx/cocoa/aboutdlg.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/aboutdlg.mm
+monolib_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/tokenzr.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_aboutdlg.o: $(srcdir)/src/gtk/aboutdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/aboutdlg.cpp
+monolib_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/txtstrm.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
+monolib_unichar.o: $(srcdir)/src/common/unichar.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/unichar.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
+monolib_uri.o: $(srcdir)/src/common/uri.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/uri.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_notifmsg.o: $(srcdir)/src/gtk/hildon/notifmsg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/hildon/notifmsg.cpp
+monolib_ustring.o: $(srcdir)/src/common/ustring.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/ustring.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/taskbar.cpp
+monolib_variant.o: $(srcdir)/src/common/variant.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/variant.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/taskbar.cpp
+monolib_wfstream.o: $(srcdir)/src/common/wfstream.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/wfstream.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_taskbar.o: $(srcdir)/src/osx/carbon/taskbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/taskbar.cpp
+monolib_wxcrt.o: $(srcdir)/src/common/wxcrt.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/wxcrt.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_taskbar.o: $(srcdir)/src/osx/cocoa/taskbar.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/taskbar.mm
+monolib_wxprintf.o: $(srcdir)/src/common/wxprintf.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/wxprintf.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@monodll_taskbar.o: $(srcdir)/src/cocoa/taskbar.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/taskbar.mm
+monolib_xlocale.o: $(srcdir)/src/common/xlocale.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/xlocale.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_taskbar.o: $(srcdir)/src/gtk/taskbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/taskbar.cpp
+monolib_xti.o: $(srcdir)/src/common/xti.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/xti.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_taskbar.o: $(srcdir)/src/gtk1/taskbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/taskbar.cpp
+monolib_xtistrm.o: $(srcdir)/src/common/xtistrm.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/xtistrm.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_joystick.o: $(srcdir)/src/msw/joystick.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/joystick.cpp
+monolib_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/zipstrm.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
+monolib_zstream.o: $(srcdir)/src/common/zstream.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/zstream.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
+monolib_unix_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
+monolib_basemsw.o: $(srcdir)/src/msw/basemsw.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/basemsw.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
+monolib_crashrpt.o: $(srcdir)/src/msw/crashrpt.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/crashrpt.cpp
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monodll_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
+monolib_debughlp.o: $(srcdir)/src/msw/debughlp.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/debughlp.cpp
-@COND_TOOLKIT_PM_USE_GUI_1@monodll_joystick.o: $(srcdir)/src/os2/joystick.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/joystick.cpp
+monolib_dde.o: $(srcdir)/src/msw/dde.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dde.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_dataview.o: $(srcdir)/src/osx/carbon/dataview.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dataview.cpp
+monolib_msw_dir.o: $(srcdir)/src/msw/dir.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dir.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_dataview.o: $(srcdir)/src/gtk/dataview.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dataview.cpp
+monolib_dlmsw.o: $(srcdir)/src/msw/dlmsw.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dlmsw.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_databrow.o: $(srcdir)/src/osx/carbon/databrow.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/databrow.cpp
+monolib_msw_mimetype.o: $(srcdir)/src/msw/mimetype.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mimetype.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
+monolib_power.o: $(srcdir)/src/msw/power.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/power.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
+monolib_regconf.o: $(srcdir)/src/msw/regconf.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/regconf.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@monodll_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
+monolib_registry.o: $(srcdir)/src/msw/registry.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/registry.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
+monolib_msw_snglinst.o: $(srcdir)/src/msw/snglinst.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/snglinst.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
+monolib_msw_stackwalk.o: $(srcdir)/src/msw/stackwalk.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/stackwalk.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
+monolib_msw_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/stdpaths.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
+monolib_msw_thread.o: $(srcdir)/src/msw/thread.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/thread.cpp
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
+monolib_msw_timer.o: $(srcdir)/src/msw/timer.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/timer.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/gtk/eggtrayicon.c
+monolib_msw_utils.o: $(srcdir)/src/msw/utils.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/utils.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_eggtrayicon.o: $(srcdir)/src/gtk1/eggtrayicon.c $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/gtk1/eggtrayicon.c
+monolib_msw_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/utilsexc.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_bmpcbox.o: $(srcdir)/src/gtk/bmpcbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/bmpcbox.cpp
+monolib_time.o: $(srcdir)/src/msw/wince/time.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/wince/time.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_bmpcbox.o: $(srcdir)/src/msw/bmpcbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/bmpcbox.cpp
+monolib_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/mimetype.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_bmpcbox.o: $(srcdir)/src/msw/bmpcbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/bmpcbox.cpp
+monolib_cfstring.o: $(srcdir)/src/osx/core/cfstring.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/cfstring.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_calctrl.o: $(srcdir)/src/gtk/calctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/calctrl.cpp
+monolib_gsockosx.o: $(srcdir)/src/osx/core/gsockosx.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/gsockosx.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
+monolib_stdpaths_cf.o: $(srcdir)/src/osx/core/stdpaths_cf.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/stdpaths_cf.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
+monolib_strconv_cf.o: $(srcdir)/src/osx/core/strconv_cf.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/strconv_cf.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/datecontrols.cpp
+monolib_utilsexc_base.o: $(srcdir)/src/osx/core/utilsexc_base.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_base.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/datecontrols.cpp
+monolib_os2_dir.o: $(srcdir)/src/os2/dir.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dir.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp
+monolib_os2_mimetype.o: $(srcdir)/src/os2/mimetype.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/mimetype.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp
+monolib_os2_stdpaths.o: $(srcdir)/src/os2/stdpaths.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/stdpaths.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_mediactrl_am.o: $(srcdir)/src/msw/mediactrl_am.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_am.cpp
+monolib_os2_thread.o: $(srcdir)/src/os2/thread.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/thread.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_mediactrl_am.o: $(srcdir)/src/msw/mediactrl_am.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_am.cpp
+monolib_os2_utils.o: $(srcdir)/src/os2/utils.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/utils.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_mediactrl_wmp10.o: $(srcdir)/src/msw/mediactrl_wmp10.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_wmp10.cpp
+monolib_os2_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/utilsexc.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_mediactrl_wmp10.o: $(srcdir)/src/msw/mediactrl_wmp10.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_wmp10.cpp
+monolib_msdos_dir.o: $(srcdir)/src/msdos/dir.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msdos/dir.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_mediactrl_qt.o: $(srcdir)/src/msw/mediactrl_qt.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_qt.cpp
+monolib_msdos_mimetype.o: $(srcdir)/src/msdos/mimetype.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msdos/mimetype.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_mediactrl_qt.o: $(srcdir)/src/msw/mediactrl_qt.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_qt.cpp
+monolib_utilsdos.o: $(srcdir)/src/msdos/utilsdos.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msdos/utilsdos.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
+monolib_event.o: $(srcdir)/src/common/event.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/event.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
+monolib_fs_mem.o: $(srcdir)/src/common/fs_mem.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fs_mem.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_mediactrl.o: $(srcdir)/src/osx/carbon/mediactrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/mediactrl.cpp
+monolib_msgout.o: $(srcdir)/src/common/msgout.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/msgout.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@monodll_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/mediactrl.mm
+monolib_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/utilscmn.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
+monolib_msw_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp
-@COND_TOOLKIT_GTK_USE_GUI_1@monodll_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
+monolib_msw_main.o: $(srcdir)/src/msw/main.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/main.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
+monolib_mslu.o: $(srcdir)/src/msw/mslu.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mslu.cpp
-@COND_PLATFORM_UNIX_1_USE_GUI_1@monodll_chm.o: $(srcdir)/src/html/chm.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/chm.cpp
+monolib_volume.o: $(srcdir)/src/msw/volume.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/volume.cpp
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@monodll_chm.o: $(srcdir)/src/html/chm.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/chm.cpp
+monolib_carbon_utils.o: $(srcdir)/src/osx/carbon/utils.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/utils.cpp
-monodll_version_rc.o: $(srcdir)/src/msw/version.rc $(MONODLL_ODEP)
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_BASE=1 --define WXMAKINGDLL --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS
+monolib_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/uma.cpp
-monolib_appbase.o: $(srcdir)/src/common/appbase.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/appbase.cpp
+monolib_osx_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm
-monolib_arcall.o: $(srcdir)/src/common/arcall.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/arcall.cpp
+monolib_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fs_inet.cpp
-monolib_arcfind.o: $(srcdir)/src/common/arcfind.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/arcfind.cpp
+monolib_ftp.o: $(srcdir)/src/common/ftp.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/ftp.cpp
-monolib_archive.o: $(srcdir)/src/common/archive.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/archive.cpp
+monolib_http.o: $(srcdir)/src/common/http.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/http.cpp
-monolib_arrstr.o: $(srcdir)/src/common/arrstr.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/arrstr.cpp
+monolib_protocol.o: $(srcdir)/src/common/protocol.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/protocol.cpp
-monolib_base64.o: $(srcdir)/src/common/base64.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/base64.cpp
+monolib_sckaddr.o: $(srcdir)/src/common/sckaddr.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/sckaddr.cpp
-monolib_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/clntdata.cpp
+monolib_sckfile.o: $(srcdir)/src/common/sckfile.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/sckfile.cpp
-monolib_cmdline.o: $(srcdir)/src/common/cmdline.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/cmdline.cpp
+monolib_sckipc.o: $(srcdir)/src/common/sckipc.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/sckipc.cpp
-monolib_config.o: $(srcdir)/src/common/config.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/config.cpp
+monolib_sckstrm.o: $(srcdir)/src/common/sckstrm.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/sckstrm.cpp
-monolib_convauto.o: $(srcdir)/src/common/convauto.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/convauto.cpp
+monolib_socket.o: $(srcdir)/src/common/socket.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/socket.cpp
-monolib_datetime.o: $(srcdir)/src/common/datetime.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/datetime.cpp
+monolib_url.o: $(srcdir)/src/common/url.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/url.cpp
-monolib_datstrm.o: $(srcdir)/src/common/datstrm.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/datstrm.cpp
+monolib_msw_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gsocket.cpp
-monolib_dircmn.o: $(srcdir)/src/common/dircmn.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dircmn.cpp
+monolib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gsockmsw.cpp
-monolib_dynarray.o: $(srcdir)/src/common/dynarray.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dynarray.cpp
+monolib_urlmsw.o: $(srcdir)/src/msw/urlmsw.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/urlmsw.cpp
-monolib_dynlib.o: $(srcdir)/src/common/dynlib.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dynlib.cpp
+monolib_net.o: $(srcdir)/src/msw/wince/net.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/wince/net.cpp
-monolib_dynload.o: $(srcdir)/src/common/dynload.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dynload.cpp
+monolib_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp
-monolib_encconv.o: $(srcdir)/src/common/encconv.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/encconv.cpp
+monolib_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp
-monolib_evtloopcmn.o: $(srcdir)/src/common/evtloopcmn.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/evtloopcmn.cpp
+monolib_gtk_bmpbuttn.o: $(srcdir)/src/gtk/bmpbuttn.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/bmpbuttn.cpp
-monolib_extended.o: $(srcdir)/src/common/extended.c $(MONOLIB_ODEP)
- $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/common/extended.c
+monolib_gtk_button.o: $(srcdir)/src/gtk/button.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/button.cpp
-monolib_ffile.o: $(srcdir)/src/common/ffile.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/ffile.cpp
+monolib_gtk_checkbox.o: $(srcdir)/src/gtk/checkbox.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/checkbox.cpp
-monolib_file.o: $(srcdir)/src/common/file.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/file.cpp
+monolib_gtk_checklst.o: $(srcdir)/src/gtk/checklst.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/checklst.cpp
-monolib_fileback.o: $(srcdir)/src/common/fileback.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fileback.cpp
+monolib_gtk_choice.o: $(srcdir)/src/gtk/choice.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/choice.cpp
-monolib_fileconf.o: $(srcdir)/src/common/fileconf.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fileconf.cpp
+monolib_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp
-monolib_filefn.o: $(srcdir)/src/common/filefn.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/filefn.cpp
+monolib_gtk_colordlg.o: $(srcdir)/src/gtk/colordlg.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/colordlg.cpp
-monolib_filename.o: $(srcdir)/src/common/filename.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/filename.cpp
+monolib_gtk_combobox.o: $(srcdir)/src/gtk/combobox.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/combobox.cpp
-monolib_filesys.o: $(srcdir)/src/common/filesys.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/filesys.cpp
+monolib_gtk_control.o: $(srcdir)/src/gtk/control.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/control.cpp
-monolib_filtall.o: $(srcdir)/src/common/filtall.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/filtall.cpp
+monolib_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/clrpicker.cpp
-monolib_filtfind.o: $(srcdir)/src/common/filtfind.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/filtfind.cpp
+monolib_gtk_dialog.o: $(srcdir)/src/gtk/dialog.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dialog.cpp
-monolib_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fmapbase.cpp
+monolib_fontpicker.o: $(srcdir)/src/gtk/fontpicker.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/fontpicker.cpp
-monolib_fs_arc.o: $(srcdir)/src/common/fs_arc.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fs_arc.cpp
+monolib_filepicker.o: $(srcdir)/src/gtk/filepicker.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/filepicker.cpp
-monolib_fs_filter.o: $(srcdir)/src/common/fs_filter.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fs_filter.cpp
+monolib_gtk_dirdlg.o: $(srcdir)/src/gtk/dirdlg.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dirdlg.cpp
-monolib_hash.o: $(srcdir)/src/common/hash.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/hash.cpp
+monolib_gtk_filedlg.o: $(srcdir)/src/gtk/filedlg.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/filedlg.cpp
-monolib_hashmap.o: $(srcdir)/src/common/hashmap.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/hashmap.cpp
+monolib_gtk_fontdlg.o: $(srcdir)/src/gtk/fontdlg.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/fontdlg.cpp
-monolib_init.o: $(srcdir)/src/common/init.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/init.cpp
+monolib_gtk_frame.o: $(srcdir)/src/gtk/frame.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/frame.cpp
-monolib_intl.o: $(srcdir)/src/common/intl.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/intl.cpp
+monolib_gtk_gauge.o: $(srcdir)/src/gtk/gauge.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/gauge.cpp
-monolib_ipcbase.o: $(srcdir)/src/common/ipcbase.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/ipcbase.cpp
+monolib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/gnome/gprint.cpp
-monolib_list.o: $(srcdir)/src/common/list.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/list.cpp
+monolib_gvfs.o: $(srcdir)/src/gtk/gnome/gvfs.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/gnome/gvfs.cpp
-monolib_log.o: $(srcdir)/src/common/log.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/log.cpp
+monolib_gtk_print.o: $(srcdir)/src/gtk/print.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/print.cpp
-monolib_longlong.o: $(srcdir)/src/common/longlong.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/longlong.cpp
+monolib_gtk_listbox.o: $(srcdir)/src/gtk/listbox.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/listbox.cpp
-monolib_memory.o: $(srcdir)/src/common/memory.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/memory.cpp
+monolib_gtk_mdi.o: $(srcdir)/src/gtk/mdi.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/mdi.cpp
-monolib_mimecmn.o: $(srcdir)/src/common/mimecmn.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/mimecmn.cpp
+monolib_gtk_menu.o: $(srcdir)/src/gtk/menu.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/menu.cpp
-monolib_module.o: $(srcdir)/src/common/module.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/module.cpp
+monolib_mnemonics.o: $(srcdir)/src/gtk/mnemonics.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/mnemonics.cpp
-monolib_mstream.o: $(srcdir)/src/common/mstream.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/mstream.cpp
+monolib_gtk_msgdlg.o: $(srcdir)/src/gtk/msgdlg.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/msgdlg.cpp
-monolib_object.o: $(srcdir)/src/common/object.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/object.cpp
+monolib_gtk_nativewin.o: $(srcdir)/src/gtk/nativewin.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/nativewin.cpp
-monolib_platinfo.o: $(srcdir)/src/common/platinfo.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/platinfo.cpp
+monolib_gtk_notebook.o: $(srcdir)/src/gtk/notebook.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/notebook.cpp
-monolib_powercmn.o: $(srcdir)/src/common/powercmn.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/powercmn.cpp
+monolib_gtk_radiobox.o: $(srcdir)/src/gtk/radiobox.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/radiobox.cpp
-monolib_process.o: $(srcdir)/src/common/process.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/process.cpp
+monolib_gtk_radiobut.o: $(srcdir)/src/gtk/radiobut.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/radiobut.cpp
-monolib_regex.o: $(srcdir)/src/common/regex.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/regex.cpp
+monolib_gtk_scrolbar.o: $(srcdir)/src/gtk/scrolbar.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/scrolbar.cpp
-monolib_stdpbase.o: $(srcdir)/src/common/stdpbase.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/stdpbase.cpp
+monolib_gtk_scrolwin.o: $(srcdir)/src/gtk/scrolwin.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/scrolwin.cpp
-monolib_sstream.o: $(srcdir)/src/common/sstream.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/sstream.cpp
+monolib_gtk_slider.o: $(srcdir)/src/gtk/slider.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/slider.cpp
-monolib_stopwatch.o: $(srcdir)/src/common/stopwatch.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/stopwatch.cpp
+monolib_gtk_spinbutt.o: $(srcdir)/src/gtk/spinbutt.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/spinbutt.cpp
-monolib_strconv.o: $(srcdir)/src/common/strconv.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/strconv.cpp
+monolib_gtk_spinctrl.o: $(srcdir)/src/gtk/spinctrl.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/spinctrl.cpp
-monolib_stream.o: $(srcdir)/src/common/stream.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/stream.cpp
+monolib_gtk_statbmp.o: $(srcdir)/src/gtk/statbmp.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/statbmp.cpp
-monolib_string.o: $(srcdir)/src/common/string.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/string.cpp
+monolib_gtk_statbox.o: $(srcdir)/src/gtk/statbox.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/statbox.cpp
-monolib_stringimpl.o: $(srcdir)/src/common/stringimpl.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/stringimpl.cpp
+monolib_gtk_statline.o: $(srcdir)/src/gtk/statline.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/statline.cpp
-monolib_stringops.o: $(srcdir)/src/common/stringops.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/stringops.cpp
+monolib_gtk_stattext.o: $(srcdir)/src/gtk/stattext.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/stattext.cpp
-monolib_strvararg.o: $(srcdir)/src/common/strvararg.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/strvararg.cpp
+monolib_gtk_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/tbargtk.cpp
-monolib_sysopt.o: $(srcdir)/src/common/sysopt.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/sysopt.cpp
+monolib_gtk_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/textctrl.cpp
-monolib_tarstrm.o: $(srcdir)/src/common/tarstrm.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/tarstrm.cpp
+monolib_gtk_textentry.o: $(srcdir)/src/gtk/textentry.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/textentry.cpp
-monolib_textbuf.o: $(srcdir)/src/common/textbuf.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/textbuf.cpp
+monolib_gtk_tglbtn.o: $(srcdir)/src/gtk/tglbtn.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/tglbtn.cpp
-monolib_textfile.o: $(srcdir)/src/common/textfile.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/textfile.cpp
+monolib_treeentry_gtk.o: $(srcdir)/src/gtk/treeentry_gtk.c $(MONOLIB_ODEP)
+ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/gtk/treeentry_gtk.c
-monolib_timercmn.o: $(srcdir)/src/common/timercmn.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/timercmn.cpp
+monolib_gtk1_bmpbuttn.o: $(srcdir)/src/gtk1/bmpbuttn.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/bmpbuttn.cpp
-monolib_timerimpl.o: $(srcdir)/src/common/timerimpl.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/timerimpl.cpp
+monolib_gtk1_button.o: $(srcdir)/src/gtk1/button.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/button.cpp
-monolib_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/tokenzr.cpp
+monolib_gtk1_checkbox.o: $(srcdir)/src/gtk1/checkbox.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/checkbox.cpp
-monolib_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/txtstrm.cpp
+monolib_gtk1_checklst.o: $(srcdir)/src/gtk1/checklst.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/checklst.cpp
-monolib_unichar.o: $(srcdir)/src/common/unichar.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/unichar.cpp
+monolib_gtk1_choice.o: $(srcdir)/src/gtk1/choice.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/choice.cpp
-monolib_uri.o: $(srcdir)/src/common/uri.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/uri.cpp
+monolib_gtk1_combobox.o: $(srcdir)/src/gtk1/combobox.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/combobox.cpp
-monolib_ustring.o: $(srcdir)/src/common/ustring.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/ustring.cpp
+monolib_gtk1_control.o: $(srcdir)/src/gtk1/control.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/control.cpp
-monolib_variant.o: $(srcdir)/src/common/variant.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/variant.cpp
+monolib_gtk1_dialog.o: $(srcdir)/src/gtk1/dialog.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/dialog.cpp
-monolib_wfstream.o: $(srcdir)/src/common/wfstream.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/wfstream.cpp
+monolib_gtk1_filedlg.o: $(srcdir)/src/gtk1/filedlg.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/filedlg.cpp
-monolib_wxcrt.o: $(srcdir)/src/common/wxcrt.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/wxcrt.cpp
+monolib_gtk1_fontdlg.o: $(srcdir)/src/gtk1/fontdlg.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/fontdlg.cpp
-monolib_wxprintf.o: $(srcdir)/src/common/wxprintf.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/wxprintf.cpp
+monolib_gtk1_frame.o: $(srcdir)/src/gtk1/frame.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/frame.cpp
-monolib_xlocale.o: $(srcdir)/src/common/xlocale.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/xlocale.cpp
+monolib_gtk1_gauge.o: $(srcdir)/src/gtk1/gauge.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/gauge.cpp
-monolib_xti.o: $(srcdir)/src/common/xti.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/xti.cpp
+monolib_gtk1_listbox.o: $(srcdir)/src/gtk1/listbox.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/listbox.cpp
-monolib_xtistrm.o: $(srcdir)/src/common/xtistrm.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/xtistrm.cpp
+monolib_gtk1_mdi.o: $(srcdir)/src/gtk1/mdi.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/mdi.cpp
-monolib_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/zipstrm.cpp
+monolib_gtk1_menu.o: $(srcdir)/src/gtk1/menu.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/menu.cpp
-monolib_zstream.o: $(srcdir)/src/common/zstream.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/zstream.cpp
+monolib_gtk1_notebook.o: $(srcdir)/src/gtk1/notebook.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/notebook.cpp
-monolib_basemsw.o: $(srcdir)/src/msw/basemsw.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/basemsw.cpp
+monolib_gtk1_radiobox.o: $(srcdir)/src/gtk1/radiobox.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/radiobox.cpp
-monolib_crashrpt.o: $(srcdir)/src/msw/crashrpt.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/crashrpt.cpp
+monolib_gtk1_radiobut.o: $(srcdir)/src/gtk1/radiobut.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/radiobut.cpp
-monolib_debughlp.o: $(srcdir)/src/msw/debughlp.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/debughlp.cpp
+monolib_gtk1_scrolbar.o: $(srcdir)/src/gtk1/scrolbar.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/scrolbar.cpp
-monolib_dde.o: $(srcdir)/src/msw/dde.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dde.cpp
+monolib_gtk1_scrolwin.o: $(srcdir)/src/gtk1/scrolwin.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/scrolwin.cpp
-monolib_dlmsw.o: $(srcdir)/src/msw/dlmsw.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dlmsw.cpp
+monolib_gtk1_slider.o: $(srcdir)/src/gtk1/slider.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/slider.cpp
-monolib_power.o: $(srcdir)/src/msw/power.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/power.cpp
+monolib_gtk1_spinbutt.o: $(srcdir)/src/gtk1/spinbutt.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/spinbutt.cpp
-monolib_regconf.o: $(srcdir)/src/msw/regconf.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/regconf.cpp
+monolib_gtk1_spinctrl.o: $(srcdir)/src/gtk1/spinctrl.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/spinctrl.cpp
-monolib_registry.o: $(srcdir)/src/msw/registry.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/registry.cpp
+monolib_gtk1_statbmp.o: $(srcdir)/src/gtk1/statbmp.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/statbmp.cpp
-monolib_time.o: $(srcdir)/src/msw/wince/time.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/wince/time.cpp
+monolib_gtk1_statbox.o: $(srcdir)/src/gtk1/statbox.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/statbox.cpp
-monolib_cfstring.o: $(srcdir)/src/osx/core/cfstring.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/cfstring.cpp
+monolib_gtk1_statline.o: $(srcdir)/src/gtk1/statline.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/statline.cpp
-monolib_gsockosx.o: $(srcdir)/src/osx/core/gsockosx.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/gsockosx.cpp
+monolib_gtk1_stattext.o: $(srcdir)/src/gtk1/stattext.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/stattext.cpp
-monolib_stdpaths_cf.o: $(srcdir)/src/osx/core/stdpaths_cf.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/stdpaths_cf.cpp
+monolib_gtk1_tbargtk.o: $(srcdir)/src/gtk1/tbargtk.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/tbargtk.cpp
-monolib_strconv_cf.o: $(srcdir)/src/osx/core/strconv_cf.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/strconv_cf.cpp
+monolib_gtk1_textctrl.o: $(srcdir)/src/gtk1/textctrl.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/textctrl.cpp
-monolib_utilsexc_base.o: $(srcdir)/src/osx/core/utilsexc_base.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_base.cpp
+monolib_gtk1_tglbtn.o: $(srcdir)/src/gtk1/tglbtn.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/tglbtn.cpp
-monolib_utilsdos.o: $(srcdir)/src/msdos/utilsdos.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msdos/utilsdos.cpp
+monolib_motif_accel.o: $(srcdir)/src/motif/accel.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/accel.cpp
-monolib_event.o: $(srcdir)/src/common/event.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/event.cpp
+monolib_motif_app.o: $(srcdir)/src/motif/app.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/app.cpp
-monolib_fs_mem.o: $(srcdir)/src/common/fs_mem.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fs_mem.cpp
+monolib_motif_bmpbuttn.o: $(srcdir)/src/motif/bmpbuttn.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/bmpbuttn.cpp
-monolib_msgout.o: $(srcdir)/src/common/msgout.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/msgout.cpp
+monolib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/bmpmotif.cpp
-monolib_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/utilscmn.cpp
+monolib_motif_button.o: $(srcdir)/src/motif/button.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/button.cpp
-monolib_mslu.o: $(srcdir)/src/msw/mslu.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mslu.cpp
+monolib_motif_checkbox.o: $(srcdir)/src/motif/checkbox.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/checkbox.cpp
-monolib_volume.o: $(srcdir)/src/msw/volume.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/volume.cpp
+monolib_motif_checklst.o: $(srcdir)/src/motif/checklst.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/checklst.cpp
-monolib_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/uma.cpp
+monolib_motif_choice.o: $(srcdir)/src/motif/choice.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/choice.cpp
-monolib_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fs_inet.cpp
+monolib_motif_clipbrd.o: $(srcdir)/src/motif/clipbrd.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/clipbrd.cpp
-monolib_ftp.o: $(srcdir)/src/common/ftp.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/ftp.cpp
+monolib_motif_colour.o: $(srcdir)/src/motif/colour.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/colour.cpp
-monolib_http.o: $(srcdir)/src/common/http.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/http.cpp
+monolib_motif_combobox.o: $(srcdir)/src/motif/combobox.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/combobox.cpp
-monolib_protocol.o: $(srcdir)/src/common/protocol.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/protocol.cpp
+monolib_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/combobox_native.cpp
-monolib_sckaddr.o: $(srcdir)/src/common/sckaddr.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/sckaddr.cpp
+monolib_motif_control.o: $(srcdir)/src/motif/control.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/control.cpp
-monolib_sckfile.o: $(srcdir)/src/common/sckfile.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/sckfile.cpp
+monolib_motif_cursor.o: $(srcdir)/src/motif/cursor.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/cursor.cpp
-monolib_sckipc.o: $(srcdir)/src/common/sckipc.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/sckipc.cpp
+monolib_motif_data.o: $(srcdir)/src/motif/data.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/data.cpp
-monolib_sckstrm.o: $(srcdir)/src/common/sckstrm.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/sckstrm.cpp
+monolib_motif_dataobj.o: $(srcdir)/src/motif/dataobj.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/dataobj.cpp
-monolib_socket.o: $(srcdir)/src/common/socket.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/socket.cpp
+monolib_motif_dc.o: $(srcdir)/src/motif/dc.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/dc.cpp
-monolib_url.o: $(srcdir)/src/common/url.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/url.cpp
+monolib_motif_dcclient.o: $(srcdir)/src/motif/dcclient.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/dcclient.cpp
-monolib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gsockmsw.cpp
+monolib_motif_dcmemory.o: $(srcdir)/src/motif/dcmemory.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/dcmemory.cpp
-monolib_urlmsw.o: $(srcdir)/src/msw/urlmsw.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/urlmsw.cpp
+monolib_motif_dcscreen.o: $(srcdir)/src/motif/dcscreen.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/dcscreen.cpp
-monolib_net.o: $(srcdir)/src/msw/wince/net.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/wince/net.cpp
+monolib_motif_dialog.o: $(srcdir)/src/motif/dialog.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/dialog.cpp
-monolib_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp
+monolib_motif_evtloop.o: $(srcdir)/src/motif/evtloop.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/evtloop.cpp
-monolib_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp
+monolib_motif_filedlg.o: $(srcdir)/src/motif/filedlg.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/filedlg.cpp
-monolib_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp
+monolib_motif_font.o: $(srcdir)/src/motif/font.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/font.cpp
-monolib_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/clrpicker.cpp
+monolib_motif_frame.o: $(srcdir)/src/motif/frame.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/frame.cpp
-monolib_fontpicker.o: $(srcdir)/src/gtk/fontpicker.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/fontpicker.cpp
+monolib_motif_gauge.o: $(srcdir)/src/motif/gauge.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/gauge.cpp
-monolib_filepicker.o: $(srcdir)/src/gtk/filepicker.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/filepicker.cpp
+monolib_gsockmot.o: $(srcdir)/src/motif/gsockmot.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/gsockmot.cpp
-monolib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/gnome/gprint.cpp
+monolib_motif_icon.o: $(srcdir)/src/motif/icon.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/icon.cpp
-monolib_gvfs.o: $(srcdir)/src/gtk/gnome/gvfs.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/gnome/gvfs.cpp
+monolib_motif_listbox.o: $(srcdir)/src/motif/listbox.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/listbox.cpp
-monolib_mnemonics.o: $(srcdir)/src/gtk/mnemonics.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/mnemonics.cpp
+monolib_motif_main.o: $(srcdir)/src/motif/main.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/main.cpp
-monolib_treeentry_gtk.o: $(srcdir)/src/gtk/treeentry_gtk.c $(MONOLIB_ODEP)
- $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/gtk/treeentry_gtk.c
+monolib_motif_mdi.o: $(srcdir)/src/motif/mdi.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/mdi.cpp
-monolib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/bmpmotif.cpp
+monolib_motif_menu.o: $(srcdir)/src/motif/menu.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/menu.cpp
-monolib_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/combobox_native.cpp
+monolib_motif_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/menuitem.cpp
-monolib_gsockmot.o: $(srcdir)/src/motif/gsockmot.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/gsockmot.cpp
+monolib_motif_minifram.o: $(srcdir)/src/motif/minifram.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/minifram.cpp
+
+monolib_motif_msgdlg.o: $(srcdir)/src/motif/msgdlg.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/msgdlg.cpp
+
+monolib_motif_popupwin.o: $(srcdir)/src/motif/popupwin.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/popupwin.cpp
+
+monolib_motif_radiobox.o: $(srcdir)/src/motif/radiobox.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/radiobox.cpp
+
+monolib_motif_radiobut.o: $(srcdir)/src/motif/radiobut.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/radiobut.cpp
+
+monolib_motif_scrolbar.o: $(srcdir)/src/motif/scrolbar.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/scrolbar.cpp
+
+monolib_motif_settings.o: $(srcdir)/src/motif/settings.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/settings.cpp
+
+monolib_motif_slider.o: $(srcdir)/src/motif/slider.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/slider.cpp
+
+monolib_motif_spinbutt.o: $(srcdir)/src/motif/spinbutt.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/spinbutt.cpp
+
+monolib_motif_statbmp.o: $(srcdir)/src/motif/statbmp.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/statbmp.cpp
+
+monolib_motif_statbox.o: $(srcdir)/src/motif/statbox.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/statbox.cpp
+
+monolib_motif_stattext.o: $(srcdir)/src/motif/stattext.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/stattext.cpp
+
+monolib_motif_textctrl.o: $(srcdir)/src/motif/textctrl.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/textctrl.cpp
+
+monolib_motif_textentry.o: $(srcdir)/src/motif/textentry.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/textentry.cpp
+
+monolib_motif_timer.o: $(srcdir)/src/motif/timer.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/timer.cpp
+
+monolib_motif_toolbar.o: $(srcdir)/src/motif/toolbar.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/toolbar.cpp
+
+monolib_motif_toplevel.o: $(srcdir)/src/motif/toplevel.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/toplevel.cpp
+
+monolib_motif_utils.o: $(srcdir)/src/motif/utils.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/utils.cpp
+
+monolib_motif_window.o: $(srcdir)/src/motif/window.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/window.cpp
monolib_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c $(MONOLIB_ODEP)
$(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/motif/xmcombo/xmcombo.c
+monolib_generic_notebook.o: $(srcdir)/src/generic/notebook.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/notebook.cpp
+
+monolib_generic_statline.o: $(srcdir)/src/generic/statline.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statline.cpp
+
+monolib_msw_checklst.o: $(srcdir)/src/msw/checklst.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp
+
+monolib_msw_fdrepdlg.o: $(srcdir)/src/msw/fdrepdlg.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/fdrepdlg.cpp
+
+monolib_msw_fontdlg.o: $(srcdir)/src/msw/fontdlg.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/fontdlg.cpp
+
+monolib_wince_checklst.o: $(srcdir)/src/msw/wince/checklst.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/wince/checklst.cpp
+
monolib_choicece.o: $(srcdir)/src/msw/wince/choicece.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/wince/choicece.cpp
@@ -19100,93 +19629,732 @@ monolib_tbarwce.o: $(srcdir)/src/msw/wince/tbarwce.cpp $(MONOLIB_ODEP)
monolib_textctrlce.o: $(srcdir)/src/msw/wince/textctrlce.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/wince/textctrlce.cpp
-monolib_listctrl_mac.o: $(srcdir)/src/osx/carbon/listctrl_mac.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/listctrl_mac.cpp
+monolib_carbon_bmpbuttn.o: $(srcdir)/src/osx/carbon/bmpbuttn.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/bmpbuttn.cpp
-monolib_notebmac.o: $(srcdir)/src/osx/carbon/notebmac.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/notebmac.cpp
+monolib_carbon_button.o: $(srcdir)/src/osx/carbon/button.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/button.cpp
-monolib_statlmac.o: $(srcdir)/src/osx/carbon/statlmac.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statlmac.cpp
+monolib_carbon_checkbox.o: $(srcdir)/src/osx/carbon/checkbox.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/checkbox.cpp
-monolib_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/htmlctrl/webkit/webkit.mm
+monolib_carbon_choice.o: $(srcdir)/src/osx/carbon/choice.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/choice.cpp
-monolib_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/NSBox.mm
+monolib_carbon_colordlg.o: $(srcdir)/src/osx/carbon/colordlg.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/colordlg.cpp
-monolib_NSButton.o: $(srcdir)/src/cocoa/NSButton.mm $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/NSButton.mm
+monolib_carbon_dialog.o: $(srcdir)/src/osx/carbon/dialog.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dialog.cpp
-monolib_NSControl.o: $(srcdir)/src/cocoa/NSControl.mm $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/NSControl.mm
+monolib_carbon_dirdlg.o: $(srcdir)/src/osx/carbon/dirdlg.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dirdlg.cpp
-monolib_NSMenu.o: $(srcdir)/src/cocoa/NSMenu.mm $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/NSMenu.mm
+monolib_carbon_evtloop.o: $(srcdir)/src/osx/carbon/evtloop.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/evtloop.cpp
-monolib_NSPanel.o: $(srcdir)/src/cocoa/NSPanel.mm $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/NSPanel.mm
+monolib_carbon_filedlg.o: $(srcdir)/src/osx/carbon/filedlg.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/filedlg.cpp
-monolib_NSScroller.o: $(srcdir)/src/cocoa/NSScroller.mm $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/NSScroller.mm
+monolib_carbon_gauge.o: $(srcdir)/src/osx/carbon/gauge.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/gauge.cpp
-monolib_NSSlider.o: $(srcdir)/src/cocoa/NSSlider.mm $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/NSSlider.mm
+monolib_carbon_listbox.o: $(srcdir)/src/osx/carbon/listbox.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/listbox.cpp
-monolib_NSTabView.o: $(srcdir)/src/cocoa/NSTabView.mm $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/NSTabView.mm
+monolib_listctrl_mac.o: $(srcdir)/src/osx/carbon/listctrl_mac.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/listctrl_mac.cpp
-monolib_NSTableView.o: $(srcdir)/src/cocoa/NSTableView.mm $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/NSTableView.mm
+monolib_carbon_menu.o: $(srcdir)/src/osx/carbon/menu.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/menu.cpp
-monolib_NSTextField.o: $(srcdir)/src/cocoa/NSTextField.mm $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/NSTextField.mm
+monolib_carbon_menuitem.o: $(srcdir)/src/osx/carbon/menuitem.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/menuitem.cpp
-monolib_NSView.o: $(srcdir)/src/cocoa/NSView.mm $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/NSView.mm
+monolib_carbon_msgdlg.o: $(srcdir)/src/osx/carbon/msgdlg.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/msgdlg.cpp
-monolib_NSWindow.o: $(srcdir)/src/cocoa/NSWindow.mm $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/NSWindow.mm
+monolib_carbon_nonownedwnd.o: $(srcdir)/src/osx/carbon/nonownedwnd.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/nonownedwnd.cpp
-monolib_ObjcRef.o: $(srcdir)/src/cocoa/ObjcRef.mm $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/ObjcRef.mm
+monolib_notebmac.o: $(srcdir)/src/osx/carbon/notebmac.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/notebmac.cpp
-monolib_mbarman.o: $(srcdir)/src/cocoa/mbarman.mm $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/mbarman.mm
+monolib_carbon_radiobut.o: $(srcdir)/src/osx/carbon/radiobut.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/radiobut.cpp
-monolib_statline2.o: $(srcdir)/src/cocoa/statline2.mm $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/statline2.mm
+monolib_carbon_region.o: $(srcdir)/src/osx/carbon/region.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/region.cpp
-monolib_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/gsockpm.cpp
+monolib_carbon_scrolbar.o: $(srcdir)/src/osx/carbon/scrolbar.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/scrolbar.cpp
+
+monolib_carbon_slider.o: $(srcdir)/src/osx/carbon/slider.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/slider.cpp
+
+monolib_carbon_spinbutt.o: $(srcdir)/src/osx/carbon/spinbutt.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/spinbutt.cpp
+
+monolib_carbon_srchctrl.o: $(srcdir)/src/osx/carbon/srchctrl.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/srchctrl.cpp
+
+monolib_carbon_statbmp.o: $(srcdir)/src/osx/carbon/statbmp.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statbmp.cpp
+
+monolib_carbon_statbox.o: $(srcdir)/src/osx/carbon/statbox.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statbox.cpp
+
+monolib_statlmac.o: $(srcdir)/src/osx/carbon/statlmac.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statlmac.cpp
+
+monolib_carbon_stattext.o: $(srcdir)/src/osx/carbon/stattext.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/stattext.cpp
+
+monolib_carbon_textctrl.o: $(srcdir)/src/osx/carbon/textctrl.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/textctrl.cpp
+
+monolib_carbon_tglbtn.o: $(srcdir)/src/osx/carbon/tglbtn.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/tglbtn.cpp
+
+monolib_carbon_toolbar.o: $(srcdir)/src/osx/carbon/toolbar.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/toolbar.cpp
+
+monolib_carbon_tooltip.o: $(srcdir)/src/osx/carbon/tooltip.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/tooltip.cpp
+
+monolib_carbon_window.o: $(srcdir)/src/osx/carbon/window.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/window.cpp
+
+monolib_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/html/htmlctrl/webkit/webkit.mm
+
+monolib_osx_cocoa_bmpbuttn.o: $(srcdir)/src/osx/cocoa/bmpbuttn.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/bmpbuttn.mm
+
+monolib_osx_cocoa_button.o: $(srcdir)/src/osx/cocoa/button.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/button.mm
+
+monolib_osx_cocoa_checkbox.o: $(srcdir)/src/osx/cocoa/checkbox.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/checkbox.mm
+
+monolib_osx_cocoa_choice.o: $(srcdir)/src/osx/cocoa/choice.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/choice.mm
+
+monolib_osx_cocoa_dialog.o: $(srcdir)/src/osx/cocoa/dialog.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/dialog.mm
+
+monolib_osx_cocoa_dirdlg.o: $(srcdir)/src/osx/cocoa/dirdlg.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/dirdlg.mm
+
+monolib_osx_cocoa_evtloop.o: $(srcdir)/src/osx/cocoa/evtloop.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/evtloop.mm
+
+monolib_osx_cocoa_filedlg.o: $(srcdir)/src/osx/cocoa/filedlg.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/filedlg.mm
+
+monolib_osx_cocoa_gauge.o: $(srcdir)/src/osx/cocoa/gauge.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/gauge.mm
+
+monolib_osx_cocoa_listbox.o: $(srcdir)/src/osx/cocoa/listbox.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/listbox.mm
+
+monolib_osx_cocoa_menu.o: $(srcdir)/src/osx/cocoa/menu.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/menu.mm
+
+monolib_osx_cocoa_menuitem.o: $(srcdir)/src/osx/cocoa/menuitem.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/menuitem.mm
+
+monolib_osx_cocoa_msgdlg.o: $(srcdir)/src/osx/cocoa/msgdlg.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/msgdlg.mm
+
+monolib_cocoa_nonownedwnd.o: $(srcdir)/src/osx/cocoa/nonownedwnd.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/nonownedwnd.mm
+
+monolib_osx_cocoa_notebook.o: $(srcdir)/src/osx/cocoa/notebook.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/notebook.mm
+
+monolib_osx_cocoa_radiobut.o: $(srcdir)/src/osx/cocoa/radiobut.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/radiobut.mm
+
+monolib_osx_cocoa_scrolbar.o: $(srcdir)/src/osx/cocoa/scrolbar.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/scrolbar.mm
+
+monolib_osx_cocoa_slider.o: $(srcdir)/src/osx/cocoa/slider.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/slider.mm
+
+monolib_osx_cocoa_spinbutt.o: $(srcdir)/src/osx/cocoa/spinbutt.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/spinbutt.mm
+
+monolib_cocoa_srchctrl.o: $(srcdir)/src/osx/cocoa/srchctrl.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/srchctrl.mm
+
+monolib_osx_cocoa_statbox.o: $(srcdir)/src/osx/cocoa/statbox.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/statbox.mm
+
+monolib_cocoa_statline.o: $(srcdir)/src/osx/cocoa/statline.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/statline.mm
+
+monolib_osx_cocoa_stattext.o: $(srcdir)/src/osx/cocoa/stattext.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/stattext.mm
+
+monolib_osx_cocoa_textctrl.o: $(srcdir)/src/osx/cocoa/textctrl.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/textctrl.mm
+
+monolib_cocoa_tglbtn.o: $(srcdir)/src/osx/cocoa/tglbtn.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/tglbtn.mm
+
+monolib_osx_cocoa_toolbar.o: $(srcdir)/src/osx/cocoa/toolbar.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/toolbar.mm
+
+monolib_osx_cocoa_tooltip.o: $(srcdir)/src/osx/cocoa/tooltip.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/tooltip.mm
+
+monolib_osx_cocoa_window.o: $(srcdir)/src/osx/cocoa/window.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/window.mm
+
+monolib_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSBox.mm
+
+monolib_NSButton.o: $(srcdir)/src/cocoa/NSButton.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSButton.mm
+
+monolib_NSControl.o: $(srcdir)/src/cocoa/NSControl.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSControl.mm
+
+monolib_NSMenu.o: $(srcdir)/src/cocoa/NSMenu.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSMenu.mm
+
+monolib_NSPanel.o: $(srcdir)/src/cocoa/NSPanel.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSPanel.mm
+
+monolib_NSScroller.o: $(srcdir)/src/cocoa/NSScroller.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSScroller.mm
+
+monolib_NSSlider.o: $(srcdir)/src/cocoa/NSSlider.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSSlider.mm
+
+monolib_NSTabView.o: $(srcdir)/src/cocoa/NSTabView.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSTabView.mm
+
+monolib_NSTableView.o: $(srcdir)/src/cocoa/NSTableView.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSTableView.mm
+
+monolib_NSTextField.o: $(srcdir)/src/cocoa/NSTextField.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSTextField.mm
+
+monolib_NSView.o: $(srcdir)/src/cocoa/NSView.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSView.mm
+
+monolib_NSWindow.o: $(srcdir)/src/cocoa/NSWindow.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSWindow.mm
+
+monolib_ObjcRef.o: $(srcdir)/src/cocoa/ObjcRef.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/ObjcRef.mm
+
+monolib_cocoa_app.o: $(srcdir)/src/cocoa/app.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/app.mm
+
+monolib_cocoa_bitmap.o: $(srcdir)/src/cocoa/bitmap.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/bitmap.mm
+
+monolib_src_cocoa_bmpbuttn.o: $(srcdir)/src/cocoa/bmpbuttn.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/bmpbuttn.mm
+
+monolib_cocoa_brush.o: $(srcdir)/src/cocoa/brush.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/brush.mm
+
+monolib_src_cocoa_button.o: $(srcdir)/src/cocoa/button.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/button.mm
+
+monolib_src_cocoa_checkbox.o: $(srcdir)/src/cocoa/checkbox.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/checkbox.mm
+
+monolib_cocoa_checklst.o: $(srcdir)/src/cocoa/checklst.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/checklst.mm
+
+monolib_src_cocoa_choice.o: $(srcdir)/src/cocoa/choice.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/choice.mm
+
+monolib_cocoa_clipbrd.o: $(srcdir)/src/cocoa/clipbrd.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/clipbrd.mm
+
+monolib_cocoa_colordlg.o: $(srcdir)/src/cocoa/colordlg.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/colordlg.mm
+
+monolib_cocoa_colour.o: $(srcdir)/src/cocoa/colour.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/colour.mm
+
+monolib_cocoa_combobox.o: $(srcdir)/src/cocoa/combobox.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/combobox.mm
+
+monolib_cocoa_control.o: $(srcdir)/src/cocoa/control.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/control.mm
+
+monolib_cocoa_cursor.o: $(srcdir)/src/cocoa/cursor.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/cursor.mm
+
+monolib_cocoa_data.o: $(srcdir)/src/cocoa/data.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/data.cpp
+
+monolib_cocoa_dataobj.o: $(srcdir)/src/cocoa/dataobj.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/dataobj.mm
+
+monolib_cocoa_dc.o: $(srcdir)/src/cocoa/dc.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/dc.mm
+
+monolib_cocoa_dcclient.o: $(srcdir)/src/cocoa/dcclient.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/dcclient.mm
+
+monolib_cocoa_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/dcmemory.mm
+
+monolib_cocoa_dcscreen.o: $(srcdir)/src/cocoa/dcscreen.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/dcscreen.cpp
+
+monolib_src_cocoa_dialog.o: $(srcdir)/src/cocoa/dialog.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/dialog.mm
+
+monolib_src_cocoa_dirdlg.o: $(srcdir)/src/cocoa/dirdlg.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/dirdlg.mm
+
+monolib_cocoa_display.o: $(srcdir)/src/cocoa/display.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/display.mm
+
+monolib_cocoa_drawer.o: $(srcdir)/src/cocoa/drawer.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/drawer.mm
+
+monolib_src_cocoa_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/evtloop.mm
+
+monolib_src_cocoa_filedlg.o: $(srcdir)/src/cocoa/filedlg.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/filedlg.mm
+
+monolib_cocoa_font.o: $(srcdir)/src/cocoa/font.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/font.mm
+
+monolib_cocoa_fontdlg.o: $(srcdir)/src/cocoa/fontdlg.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/fontdlg.mm
+
+monolib_cocoa_fontenum.o: $(srcdir)/src/cocoa/fontenum.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/fontenum.mm
+
+monolib_cocoa_fontutil.o: $(srcdir)/src/cocoa/fontutil.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/fontutil.cpp
+
+monolib_cocoa_frame.o: $(srcdir)/src/cocoa/frame.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/frame.mm
+
+monolib_src_cocoa_gauge.o: $(srcdir)/src/cocoa/gauge.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/gauge.mm
+
+monolib_cocoa_icon.o: $(srcdir)/src/cocoa/icon.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/icon.mm
+
+monolib_src_cocoa_listbox.o: $(srcdir)/src/cocoa/listbox.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/listbox.mm
+
+monolib_cocoa_main.o: $(srcdir)/src/cocoa/main.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/main.cpp
+
+monolib_mbarman.o: $(srcdir)/src/cocoa/mbarman.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/mbarman.mm
+
+monolib_cocoa_mdi.o: $(srcdir)/src/cocoa/mdi.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/mdi.mm
+
+monolib_src_cocoa_menu.o: $(srcdir)/src/cocoa/menu.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/menu.mm
+
+monolib_src_cocoa_menuitem.o: $(srcdir)/src/cocoa/menuitem.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/menuitem.mm
+
+monolib_src_cocoa_msgdlg.o: $(srcdir)/src/cocoa/msgdlg.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/msgdlg.mm
+
+monolib_src_cocoa_notebook.o: $(srcdir)/src/cocoa/notebook.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/notebook.mm
+
+monolib_cocoa_pen.o: $(srcdir)/src/cocoa/pen.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/pen.mm
+
+monolib_cocoa_radiobox.o: $(srcdir)/src/cocoa/radiobox.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/radiobox.mm
+
+monolib_src_cocoa_radiobut.o: $(srcdir)/src/cocoa/radiobut.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/radiobut.mm
+
+monolib_cocoa_region.o: $(srcdir)/src/cocoa/region.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/region.mm
+
+monolib_src_cocoa_scrolbar.o: $(srcdir)/src/cocoa/scrolbar.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/scrolbar.mm
+
+monolib_cocoa_settings.o: $(srcdir)/src/cocoa/settings.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/settings.mm
+
+monolib_src_cocoa_slider.o: $(srcdir)/src/cocoa/slider.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/slider.mm
+
+monolib_cocoa_sound.o: $(srcdir)/src/cocoa/sound.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/sound.mm
+
+monolib_src_cocoa_spinbutt.o: $(srcdir)/src/cocoa/spinbutt.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/spinbutt.mm
+
+monolib_cocoa_statbmp.o: $(srcdir)/src/cocoa/statbmp.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/statbmp.mm
+
+monolib_src_cocoa_statbox.o: $(srcdir)/src/cocoa/statbox.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/statbox.mm
+
+monolib_statline2.o: $(srcdir)/src/cocoa/statline2.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/statline2.mm
+
+monolib_src_cocoa_stattext.o: $(srcdir)/src/cocoa/stattext.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/stattext.mm
+
+monolib_src_cocoa_textctrl.o: $(srcdir)/src/cocoa/textctrl.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/textctrl.mm
+
+monolib_cocoa_timer.o: $(srcdir)/src/cocoa/timer.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/timer.mm
+
+monolib_src_cocoa_toolbar.o: $(srcdir)/src/cocoa/toolbar.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/toolbar.mm
+
+monolib_src_cocoa_tooltip.o: $(srcdir)/src/cocoa/tooltip.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/tooltip.mm
+
+monolib_cocoa_toplevel.o: $(srcdir)/src/cocoa/toplevel.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/toplevel.mm
+
+monolib_src_cocoa_utils.o: $(srcdir)/src/cocoa/utils.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/utils.mm
+
+monolib_cocoa_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/utilsexc.mm
+
+monolib_src_cocoa_window.o: $(srcdir)/src/cocoa/window.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/window.mm
+
+monolib_os2_accel.o: $(srcdir)/src/os2/accel.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/accel.cpp
+
+monolib_os2_app.o: $(srcdir)/src/os2/app.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/app.cpp
+
+monolib_os2_bitmap.o: $(srcdir)/src/os2/bitmap.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/bitmap.cpp
+
+monolib_os2_bmpbuttn.o: $(srcdir)/src/os2/bmpbuttn.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/bmpbuttn.cpp
+
+monolib_os2_brush.o: $(srcdir)/src/os2/brush.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/brush.cpp
+
+monolib_os2_button.o: $(srcdir)/src/os2/button.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/button.cpp
+
+monolib_os2_checkbox.o: $(srcdir)/src/os2/checkbox.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/checkbox.cpp
+
+monolib_os2_checklst.o: $(srcdir)/src/os2/checklst.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/checklst.cpp
+
+monolib_os2_choice.o: $(srcdir)/src/os2/choice.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/choice.cpp
+
+monolib_os2_clipbrd.o: $(srcdir)/src/os2/clipbrd.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/clipbrd.cpp
+
+monolib_os2_colour.o: $(srcdir)/src/os2/colour.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/colour.cpp
+
+monolib_os2_combobox.o: $(srcdir)/src/os2/combobox.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/combobox.cpp
+
+monolib_os2_control.o: $(srcdir)/src/os2/control.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/control.cpp
+
+monolib_os2_cursor.o: $(srcdir)/src/os2/cursor.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/cursor.cpp
+
+monolib_os2_data.o: $(srcdir)/src/os2/data.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/data.cpp
+
+monolib_os2_dataobj.o: $(srcdir)/src/os2/dataobj.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dataobj.cpp
+
+monolib_os2_dc.o: $(srcdir)/src/os2/dc.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dc.cpp
+
+monolib_os2_dcclient.o: $(srcdir)/src/os2/dcclient.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dcclient.cpp
+
+monolib_os2_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dcmemory.cpp
+
+monolib_os2_dcprint.o: $(srcdir)/src/os2/dcprint.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dcprint.cpp
+
+monolib_os2_dcscreen.o: $(srcdir)/src/os2/dcscreen.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dcscreen.cpp
+
+monolib_os2_dialog.o: $(srcdir)/src/os2/dialog.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dialog.cpp
+
+monolib_os2_dnd.o: $(srcdir)/src/os2/dnd.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dnd.cpp
+
+monolib_os2_evtloop.o: $(srcdir)/src/os2/evtloop.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/evtloop.cpp
+
+monolib_os2_filedlg.o: $(srcdir)/src/os2/filedlg.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/filedlg.cpp
+
+monolib_os2_font.o: $(srcdir)/src/os2/font.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/font.cpp
+
+monolib_os2_fontdlg.o: $(srcdir)/src/os2/fontdlg.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/fontdlg.cpp
+
+monolib_os2_fontenum.o: $(srcdir)/src/os2/fontenum.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/fontenum.cpp
+
+monolib_os2_fontutil.o: $(srcdir)/src/os2/fontutil.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/fontutil.cpp
+
+monolib_os2_frame.o: $(srcdir)/src/os2/frame.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/frame.cpp
+
+monolib_os2_gauge.o: $(srcdir)/src/os2/gauge.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/gauge.cpp
+
+monolib_os2_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/gdiimage.cpp
+
+monolib_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/gsockpm.cpp
+
+monolib_os2_helpwin.o: $(srcdir)/src/os2/helpwin.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/helpwin.cpp
+
+monolib_os2_icon.o: $(srcdir)/src/os2/icon.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/icon.cpp
+
+monolib_os2_iniconf.o: $(srcdir)/src/os2/iniconf.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/iniconf.cpp
+
+monolib_os2_listbox.o: $(srcdir)/src/os2/listbox.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/listbox.cpp
+
+monolib_os2_main.o: $(srcdir)/src/os2/main.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/main.cpp
+
+monolib_os2_menu.o: $(srcdir)/src/os2/menu.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/menu.cpp
+
+monolib_os2_menuitem.o: $(srcdir)/src/os2/menuitem.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/menuitem.cpp
+
+monolib_os2_metafile.o: $(srcdir)/src/os2/metafile.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/metafile.cpp
+
+monolib_os2_minifram.o: $(srcdir)/src/os2/minifram.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/minifram.cpp
+
+monolib_os2_msgdlg.o: $(srcdir)/src/os2/msgdlg.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/msgdlg.cpp
+
+monolib_os2_nativdlg.o: $(srcdir)/src/os2/nativdlg.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/nativdlg.cpp
+
+monolib_os2_notebook.o: $(srcdir)/src/os2/notebook.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/notebook.cpp
+
+monolib_os2_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/ownerdrw.cpp
+
+monolib_os2_palette.o: $(srcdir)/src/os2/palette.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/palette.cpp
+
+monolib_os2_pen.o: $(srcdir)/src/os2/pen.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/pen.cpp
+
+monolib_os2_popupwin.o: $(srcdir)/src/os2/popupwin.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/popupwin.cpp
+
+monolib_os2_print.o: $(srcdir)/src/os2/print.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/print.cpp
+
+monolib_os2_radiobox.o: $(srcdir)/src/os2/radiobox.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/radiobox.cpp
+
+monolib_os2_radiobut.o: $(srcdir)/src/os2/radiobut.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/radiobut.cpp
+
+monolib_os2_region.o: $(srcdir)/src/os2/region.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/region.cpp
+
+monolib_os2_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/scrolbar.cpp
+
+monolib_os2_settings.o: $(srcdir)/src/os2/settings.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/settings.cpp
+
+monolib_os2_slider.o: $(srcdir)/src/os2/slider.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/slider.cpp
+
+monolib_os2_spinbutt.o: $(srcdir)/src/os2/spinbutt.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/spinbutt.cpp
+
+monolib_os2_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/spinctrl.cpp
+
+monolib_os2_statbmp.o: $(srcdir)/src/os2/statbmp.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/statbmp.cpp
+
+monolib_os2_statbox.o: $(srcdir)/src/os2/statbox.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/statbox.cpp
+
+monolib_os2_statline.o: $(srcdir)/src/os2/statline.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/statline.cpp
+
+monolib_os2_stattext.o: $(srcdir)/src/os2/stattext.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/stattext.cpp
+
+monolib_os2_tabctrl.o: $(srcdir)/src/os2/tabctrl.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/tabctrl.cpp
+
+monolib_os2_textctrl.o: $(srcdir)/src/os2/textctrl.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/textctrl.cpp
+
+monolib_os2_textentry.o: $(srcdir)/src/os2/textentry.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/textentry.cpp
+
+monolib_os2_tglbtn.o: $(srcdir)/src/os2/tglbtn.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/tglbtn.cpp
+
+monolib_os2_timer.o: $(srcdir)/src/os2/timer.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/timer.cpp
+
+monolib_os2_toolbar.o: $(srcdir)/src/os2/toolbar.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/toolbar.cpp
+
+monolib_os2_tooltip.o: $(srcdir)/src/os2/tooltip.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/tooltip.cpp
+
+monolib_os2_toplevel.o: $(srcdir)/src/os2/toplevel.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/toplevel.cpp
+
+monolib_os2_utilsgui.o: $(srcdir)/src/os2/utilsgui.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/utilsgui.cpp
+
+monolib_os2_window.o: $(srcdir)/src/os2/window.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/window.cpp
+
+monolib_univ_bmpbuttn.o: $(srcdir)/src/univ/bmpbuttn.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/bmpbuttn.cpp
+
+monolib_univ_button.o: $(srcdir)/src/univ/button.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/button.cpp
+
+monolib_univ_checkbox.o: $(srcdir)/src/univ/checkbox.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/checkbox.cpp
+
+monolib_univ_checklst.o: $(srcdir)/src/univ/checklst.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/checklst.cpp
+
+monolib_univ_choice.o: $(srcdir)/src/univ/choice.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/choice.cpp
+
+monolib_univ_combobox.o: $(srcdir)/src/univ/combobox.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/combobox.cpp
+
+monolib_univ_control.o: $(srcdir)/src/univ/control.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/control.cpp
monolib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/ctrlrend.cpp
+monolib_univ_dialog.o: $(srcdir)/src/univ/dialog.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/dialog.cpp
+
monolib_framuniv.o: $(srcdir)/src/univ/framuniv.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/framuniv.cpp
+monolib_univ_gauge.o: $(srcdir)/src/univ/gauge.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/gauge.cpp
+
monolib_inpcons.o: $(srcdir)/src/univ/inpcons.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/inpcons.cpp
monolib_inphand.o: $(srcdir)/src/univ/inphand.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/inphand.cpp
+monolib_univ_listbox.o: $(srcdir)/src/univ/listbox.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/listbox.cpp
+
+monolib_univ_menu.o: $(srcdir)/src/univ/menu.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/menu.cpp
+
+monolib_univ_notebook.o: $(srcdir)/src/univ/notebook.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/notebook.cpp
+
+monolib_univ_radiobox.o: $(srcdir)/src/univ/radiobox.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/radiobox.cpp
+
+monolib_univ_radiobut.o: $(srcdir)/src/univ/radiobut.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/radiobut.cpp
+
monolib_scrarrow.o: $(srcdir)/src/univ/scrarrow.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/scrarrow.cpp
+monolib_univ_scrolbar.o: $(srcdir)/src/univ/scrolbar.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/scrolbar.cpp
+
monolib_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/scrthumb.cpp
monolib_settingsuniv.o: $(srcdir)/src/univ/settingsuniv.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/settingsuniv.cpp
+monolib_univ_slider.o: $(srcdir)/src/univ/slider.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/slider.cpp
+
+monolib_univ_spinbutt.o: $(srcdir)/src/univ/spinbutt.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/spinbutt.cpp
+
+monolib_univ_statbmp.o: $(srcdir)/src/univ/statbmp.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/statbmp.cpp
+
+monolib_univ_statbox.o: $(srcdir)/src/univ/statbox.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/statbox.cpp
+
+monolib_univ_statline.o: $(srcdir)/src/univ/statline.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/statline.cpp
+
+monolib_univ_stattext.o: $(srcdir)/src/univ/stattext.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/stattext.cpp
+
+monolib_univ_statusbr.o: $(srcdir)/src/univ/statusbr.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/statusbr.cpp
+
monolib_stdrend.o: $(srcdir)/src/univ/stdrend.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/stdrend.cpp
+monolib_univ_textctrl.o: $(srcdir)/src/univ/textctrl.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/textctrl.cpp
+
+monolib_univ_tglbtn.o: $(srcdir)/src/univ/tglbtn.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/tglbtn.cpp
+
monolib_theme.o: $(srcdir)/src/univ/theme.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/theme.cpp
+monolib_univ_toolbar.o: $(srcdir)/src/univ/toolbar.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/toolbar.cpp
+
monolib_topluniv.o: $(srcdir)/src/univ/topluniv.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/topluniv.cpp
@@ -19205,15 +20373,33 @@ monolib_mono.o: $(srcdir)/src/univ/themes/mono.cpp $(MONOLIB_ODEP)
monolib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/themes/win32.cpp
+monolib_gtk_aboutdlg.o: $(srcdir)/src/gtk/aboutdlg.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/aboutdlg.cpp
+
monolib_animate.o: $(srcdir)/src/gtk/animate.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/animate.cpp
+monolib_gtk_bmpcbox.o: $(srcdir)/src/gtk/bmpcbox.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/bmpcbox.cpp
+
+monolib_gtk_calctrl.o: $(srcdir)/src/gtk/calctrl.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/calctrl.cpp
+
+monolib_gtk_dataview.o: $(srcdir)/src/gtk/dataview.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dataview.cpp
+
monolib_hyperlink.o: $(srcdir)/src/gtk/hyperlink.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/hyperlink.cpp
monolib_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/mediactrlcmn.cpp
+monolib_carbon_mediactrl.o: $(srcdir)/src/osx/carbon/mediactrl.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/mediactrl.cpp
+
+monolib_cocoa_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/mediactrl.mm
+
monolib_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/helpbest.cpp
@@ -19595,48 +20781,30 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_OS2_1@monolib_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp
-@COND_PLATFORM_UNIX_1@monolib_dir.o: $(srcdir)/src/unix/dir.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1@monolib_unix_dir.o: $(srcdir)/src/unix/dir.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dir.cpp
-@COND_PLATFORM_MACOSX_1@monolib_dir.o: $(srcdir)/src/unix/dir.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1@monolib_unix_dir.o: $(srcdir)/src/unix/dir.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dir.cpp
-@COND_PLATFORM_WIN32_1@monolib_dir.o: $(srcdir)/src/msw/dir.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dir.cpp
-
-@COND_PLATFORM_OS2_1@monolib_dir.o: $(srcdir)/src/os2/dir.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dir.cpp
-
-@COND_PLATFORM_MSDOS_1@monolib_dir.o: $(srcdir)/src/msdos/dir.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MSDOS_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msdos/dir.cpp
-
@COND_PLATFORM_UNIX_1@monolib_dlunix.o: $(srcdir)/src/unix/dlunix.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dlunix.cpp
@COND_PLATFORM_MACOSX_1@monolib_dlunix.o: $(srcdir)/src/unix/dlunix.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dlunix.cpp
-@COND_PLATFORM_UNIX_1@monolib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1@monolib_unix_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
-@COND_PLATFORM_MACOSX_1@monolib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1@monolib_unix_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
-@COND_PLATFORM_WIN32_1@monolib_snglinst.o: $(srcdir)/src/msw/snglinst.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/snglinst.cpp
-
-@COND_PLATFORM_UNIX_1@monolib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1@monolib_unix_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/stdpaths.cpp
-@COND_PLATFORM_MACOSX_1@monolib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1@monolib_unix_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/stdpaths.cpp
-@COND_PLATFORM_WIN32_1@monolib_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/stdpaths.cpp
-
-@COND_PLATFORM_OS2_1@monolib_stdpaths.o: $(srcdir)/src/os2/stdpaths.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/stdpaths.cpp
-
@COND_PLATFORM_UNIX_1@monolib_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp
@@ -19652,336 +20820,123 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_MACOSX_1@monolib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/threadpsx.cpp
-@COND_PLATFORM_UNIX_1@monolib_stackwalk.o: $(srcdir)/src/unix/stackwalk.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1@monolib_unix_stackwalk.o: $(srcdir)/src/unix/stackwalk.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/stackwalk.cpp
-@COND_PLATFORM_MACOSX_1@monolib_stackwalk.o: $(srcdir)/src/unix/stackwalk.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1@monolib_unix_stackwalk.o: $(srcdir)/src/unix/stackwalk.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/stackwalk.cpp
-@COND_PLATFORM_WIN32_1@monolib_stackwalk.o: $(srcdir)/src/msw/stackwalk.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/stackwalk.cpp
-
@COND_PLATFORM_UNIX_1@monolib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
@COND_PLATFORM_MACOSX_1@monolib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
-@COND_PLATFORM_UNIX_1@monolib_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp
-
-@COND_PLATFORM_WIN32_1@monolib_mimetype.o: $(srcdir)/src/msw/mimetype.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mimetype.cpp
-
-@COND_PLATFORM_MACOSX_1@monolib_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/mimetype.cpp
-
-@COND_PLATFORM_OS2_1@monolib_mimetype.o: $(srcdir)/src/os2/mimetype.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/mimetype.cpp
-
-@COND_PLATFORM_MSDOS_1@monolib_mimetype.o: $(srcdir)/src/msdos/mimetype.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MSDOS_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msdos/mimetype.cpp
-
@COND_PLATFORM_UNIX_1@monolib_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
@COND_PLATFORM_OS2_1@monolib_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
-@COND_PLATFORM_WIN32_1@monolib_thread.o: $(srcdir)/src/msw/thread.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/thread.cpp
+@COND_PLATFORM_UNIX_1@monolib_unix_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp
-@COND_PLATFORM_OS2_1@monolib_thread.o: $(srcdir)/src/os2/thread.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/thread.cpp
+@COND_PLATFORM_MACOSX_1@monolib_unix_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp
-@COND_PLATFORM_WIN32_1@monolib_timer.o: $(srcdir)/src/msw/timer.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/timer.cpp
+@COND_PLATFORM_OS2_1@monolib_unix_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_timer.o: $(srcdir)/src/gtk/timer.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/timer.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_timer.o: $(srcdir)/src/gtk1/timer.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/timer.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_timer.o: $(srcdir)/src/osx/core/timer.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_timer.o: $(srcdir)/src/osx/core/timer.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_timer.o: $(srcdir)/src/generic/timer.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_timer.o: $(srcdir)/src/generic/timer.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
-
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_timer.o: $(srcdir)/src/generic/timer.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_timer.o: $(srcdir)/src/motif/timer.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/timer.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_timer.o: $(srcdir)/src/cocoa/timer.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/timer.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_timer.o: $(srcdir)/src/os2/timer.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/timer.cpp
-
-@COND_PLATFORM_WIN32_1@monolib_utils.o: $(srcdir)/src/msw/utils.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/utils.cpp
-
-@COND_PLATFORM_OS2_1@monolib_utils.o: $(srcdir)/src/os2/utils.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/utils.cpp
-
-@COND_TOOLKIT_OSX_CARBON@monolib_utils.o: $(srcdir)/src/osx/carbon/utils.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/utils.cpp
-
-@COND_TOOLKIT_OSX_COCOA@monolib_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm
-
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_utils.o: $(srcdir)/src/x11/utils.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/utils.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_utils.o: $(srcdir)/src/mgl/utils.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/utils.cpp
-
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_utils.o: $(srcdir)/src/dfb/utils.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/utils.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_utils.o: $(srcdir)/src/motif/utils.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/utils.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_utils.o: $(srcdir)/src/cocoa/utils.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/utils.mm
-
-@COND_PLATFORM_WIN32_1@monolib_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/utilsexc.cpp
-
-@COND_PLATFORM_OS2_1@monolib_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/utilsexc.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/utilsexc.mm
-
-@COND_PLATFORM_WIN32_1@monolib_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/evtloop.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_evtloop.o: $(srcdir)/src/gtk1/evtloop.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/evtloop.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_evtloop.o: $(srcdir)/src/x11/evtloop.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/evtloop.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/evtloop.cpp
-
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_evtloop.o: $(srcdir)/src/dfb/evtloop.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/evtloop.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_evtloop.o: $(srcdir)/src/motif/evtloop.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/evtloop.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_evtloop.o: $(srcdir)/src/osx/carbon/evtloop.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/evtloop.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_evtloop.o: $(srcdir)/src/osx/cocoa/evtloop.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/evtloop.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/evtloop.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_evtloop.o: $(srcdir)/src/os2/evtloop.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/evtloop.cpp
-
-@COND_PLATFORM_WIN32_1@monolib_main.o: $(srcdir)/src/msw/main.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/main.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_main.o: $(srcdir)/src/gtk1/main.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/main.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_main.o: $(srcdir)/src/motif/main.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/main.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_main.o: $(srcdir)/src/cocoa/main.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/main.cpp
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_main.o: $(srcdir)/src/os2/main.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/main.cpp
-
-@COND_PLATFORM_UNIX_1@monolib_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp
-
-@COND_PLATFORM_MACOSX_1@monolib_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp
-
-@COND_PLATFORM_OS2_1@monolib_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp
-
-@COND_PLATFORM_WIN32_1@monolib_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gsocket.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_caret.o: $(srcdir)/src/msw/caret.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/caret.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_caret.o: $(srcdir)/src/msw/caret.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/caret.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_dialup.o: $(srcdir)/src/msw/dialup.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_dialup.o: $(srcdir)/src/msw/dialup.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_fontenum.o: $(srcdir)/src/mgl/fontenum.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/fontenum.cpp
-
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_fontenum.o: $(srcdir)/src/dfb/fontenum.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/fontenum.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontenum.o: $(srcdir)/src/cocoa/fontenum.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/fontenum.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_fontenum.o: $(srcdir)/src/os2/fontenum.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/fontenum.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_fontutil.o: $(srcdir)/src/mgl/fontutil.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/fontutil.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontutil.o: $(srcdir)/src/cocoa/fontutil.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/fontutil.cpp
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_fontutil.o: $(srcdir)/src/os2/fontutil.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/fontutil.cpp
-
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
@@ -20006,42 +20961,21 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_icon.o: $(srcdir)/src/msw/icon.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_icon.o: $(srcdir)/src/msw/icon.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_icon.o: $(srcdir)/src/motif/icon.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/icon.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_icon.o: $(srcdir)/src/cocoa/icon.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/icon.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_icon.o: $(srcdir)/src/os2/icon.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/icon.cpp
-
@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
@@ -20051,3797 +20985,2951 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_app.o: $(srcdir)/src/gtk/app.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_app.o: $(srcdir)/src/gtk/app.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/app.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_app.o: $(srcdir)/src/gtk1/app.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/app.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.c $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.c
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_app.o: $(srcdir)/src/msw/app.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/app.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/bitmap.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_app.o: $(srcdir)/src/msw/app.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/app.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_brush.o: $(srcdir)/src/gtk/brush.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/brush.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_app.o: $(srcdir)/src/x11/app.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/app.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_clipbrd.o: $(srcdir)/src/gtk/clipbrd.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/clipbrd.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_app.o: $(srcdir)/src/mgl/app.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/app.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_colour.o: $(srcdir)/src/gtk/colour.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/colour.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_app.o: $(srcdir)/src/dfb/app.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/app.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_cursor.o: $(srcdir)/src/gtk/cursor.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/cursor.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_app.o: $(srcdir)/src/motif/app.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/app.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_dataobj.o: $(srcdir)/src/gtk/dataobj.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dataobj.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_app.o: $(srcdir)/src/osx/carbon/app.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_dc.o: $(srcdir)/src/gtk/dc.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dc.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_app.o: $(srcdir)/src/osx/carbon/app.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_dcclient.o: $(srcdir)/src/gtk/dcclient.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dcclient.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_app.o: $(srcdir)/src/cocoa/app.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/app.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_dcmemory.o: $(srcdir)/src/gtk/dcmemory.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dcmemory.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_app.o: $(srcdir)/src/os2/app.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/app.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_dcscreen.o: $(srcdir)/src/gtk/dcscreen.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dcscreen.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.c $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.c
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_dnd.o: $(srcdir)/src/gtk/dnd.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dnd.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/bitmap.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/evtloop.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_bitmap.o: $(srcdir)/src/gtk1/bitmap.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/bitmap.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_filectrl.o: $(srcdir)/src/gtk/filectrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/filectrl.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_font.o: $(srcdir)/src/gtk/font.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/font.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/gsockgtk.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_minifram.o: $(srcdir)/src/gtk/minifram.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/minifram.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_pen.o: $(srcdir)/src/gtk/pen.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/pen.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_popupwin.o: $(srcdir)/src/gtk/popupwin.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/popupwin.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_private.o: $(srcdir)/src/gtk/private.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/private.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_bitmap.o: $(srcdir)/src/mgl/bitmap.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/bitmap.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_region.o: $(srcdir)/src/gtk/region.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/region.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_bitmap.o: $(srcdir)/src/dfb/bitmap.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/bitmap.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_renderer.o: $(srcdir)/src/gtk/renderer.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/renderer.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_bitmap.o: $(srcdir)/src/cocoa/bitmap.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/bitmap.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_settings.o: $(srcdir)/src/gtk/settings.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/settings.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_bitmap.o: $(srcdir)/src/os2/bitmap.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/bitmap.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_timer.o: $(srcdir)/src/gtk/timer.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/timer.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_brush.o: $(srcdir)/src/gtk/brush.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/brush.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_tooltip.o: $(srcdir)/src/gtk/tooltip.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/tooltip.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_brush.o: $(srcdir)/src/gtk1/brush.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/brush.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_toplevel.o: $(srcdir)/src/gtk/toplevel.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/toplevel.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_brush.o: $(srcdir)/src/x11/brush.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_utilsgtk.o: $(srcdir)/src/gtk/utilsgtk.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/utilsgtk.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_brush.o: $(srcdir)/src/x11/brush.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_win_gtk.o: $(srcdir)/src/gtk/win_gtk.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/win_gtk.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_brush.o: $(srcdir)/src/msw/brush.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/brush.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_window.o: $(srcdir)/src/gtk/window.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/window.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_brush.o: $(srcdir)/src/msw/brush.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/brush.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_app.o: $(srcdir)/src/gtk1/app.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/app.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_brush.o: $(srcdir)/src/osx/brush.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_bitmap.o: $(srcdir)/src/gtk1/bitmap.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/bitmap.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_brush.o: $(srcdir)/src/osx/brush.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_brush.o: $(srcdir)/src/gtk1/brush.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/brush.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_brush.o: $(srcdir)/src/mgl/brush.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/brush.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_clipbrd.o: $(srcdir)/src/gtk1/clipbrd.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/clipbrd.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_brush.o: $(srcdir)/src/dfb/brush.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/brush.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_colour.o: $(srcdir)/src/gtk1/colour.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/colour.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_brush.o: $(srcdir)/src/cocoa/brush.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/brush.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_cursor.o: $(srcdir)/src/gtk1/cursor.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/cursor.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_brush.o: $(srcdir)/src/os2/brush.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/brush.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_data.o: $(srcdir)/src/gtk1/data.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/data.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_clipbrd.o: $(srcdir)/src/gtk/clipbrd.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/clipbrd.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_dataobj.o: $(srcdir)/src/gtk1/dataobj.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/dataobj.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_clipbrd.o: $(srcdir)/src/gtk1/clipbrd.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/clipbrd.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_dc.o: $(srcdir)/src/gtk1/dc.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/dc.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/clipbrd.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_dcclient.o: $(srcdir)/src/gtk1/dcclient.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/dcclient.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/clipbrd.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_dcmemory.o: $(srcdir)/src/gtk1/dcmemory.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/dcmemory.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_clipbrd.o: $(srcdir)/src/x11/clipbrd.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/clipbrd.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_dcscreen.o: $(srcdir)/src/gtk1/dcscreen.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/dcscreen.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_clipbrd.o: $(srcdir)/src/mgl/clipbrd.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/clipbrd.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_dnd.o: $(srcdir)/src/gtk1/dnd.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/dnd.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_clipbrd.o: $(srcdir)/src/motif/clipbrd.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/clipbrd.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_evtloop.o: $(srcdir)/src/gtk1/evtloop.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/evtloop.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_font.o: $(srcdir)/src/gtk1/font.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/font.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_gsockgtk.o: $(srcdir)/src/gtk1/gsockgtk.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/gsockgtk.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_clipbrd.o: $(srcdir)/src/cocoa/clipbrd.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/clipbrd.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_main.o: $(srcdir)/src/gtk1/main.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/main.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_clipbrd.o: $(srcdir)/src/os2/clipbrd.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/clipbrd.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_minifram.o: $(srcdir)/src/gtk1/minifram.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/minifram.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_colour.o: $(srcdir)/src/gtk/colour.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/colour.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_pen.o: $(srcdir)/src/gtk1/pen.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/pen.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_colour.o: $(srcdir)/src/gtk1/colour.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/colour.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_popupwin.o: $(srcdir)/src/gtk1/popupwin.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/popupwin.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_colour.o: $(srcdir)/src/msw/colour.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/colour.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_region.o: $(srcdir)/src/gtk1/region.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/region.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_colour.o: $(srcdir)/src/msw/colour.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/colour.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_renderer.o: $(srcdir)/src/gtk1/renderer.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/renderer.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_colour.o: $(srcdir)/src/osx/core/colour.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_settings.o: $(srcdir)/src/gtk1/settings.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/settings.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_colour.o: $(srcdir)/src/osx/core/colour.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_timer.o: $(srcdir)/src/gtk1/timer.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/timer.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_colour.o: $(srcdir)/src/x11/colour.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/colour.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_tooltip.o: $(srcdir)/src/gtk1/tooltip.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/tooltip.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_colour.o: $(srcdir)/src/generic/colour.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_toplevel.o: $(srcdir)/src/gtk1/toplevel.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/toplevel.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_colour.o: $(srcdir)/src/generic/colour.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_utilsgtk.o: $(srcdir)/src/gtk1/utilsgtk.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/utilsgtk.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_colour.o: $(srcdir)/src/motif/colour.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/colour.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_win_gtk.o: $(srcdir)/src/gtk1/win_gtk.c $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/gtk1/win_gtk.c
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_colour.o: $(srcdir)/src/cocoa/colour.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/colour.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_window.o: $(srcdir)/src/gtk1/window.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/window.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_colour.o: $(srcdir)/src/os2/colour.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/colour.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_x11_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_cursor.o: $(srcdir)/src/gtk/cursor.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/cursor.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_cursor.o: $(srcdir)/src/gtk1/cursor.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/cursor.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_x11_brush.o: $(srcdir)/src/x11/brush.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_cursor.o: $(srcdir)/src/msw/cursor.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/cursor.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_brush.o: $(srcdir)/src/x11/brush.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_cursor.o: $(srcdir)/src/msw/cursor.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/cursor.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_x11_palette.o: $(srcdir)/src/x11/palette.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_cursor.o: $(srcdir)/src/x11/cursor.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/cursor.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_palette.o: $(srcdir)/src/x11/palette.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_cursor.o: $(srcdir)/src/mgl/cursor.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/cursor.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_x11_pen.o: $(srcdir)/src/x11/pen.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_cursor.o: $(srcdir)/src/dfb/cursor.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/cursor.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_pen.o: $(srcdir)/src/x11/pen.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_cursor.o: $(srcdir)/src/motif/cursor.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/cursor.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_x11_region.o: $(srcdir)/src/x11/region.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/region.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_region.o: $(srcdir)/src/x11/region.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/region.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_cursor.o: $(srcdir)/src/cocoa/cursor.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/cursor.mm
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_cursor.o: $(srcdir)/src/os2/cursor.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/cursor.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_app.o: $(srcdir)/src/msw/app.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/app.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_dataobj.o: $(srcdir)/src/gtk/dataobj.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dataobj.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_app.o: $(srcdir)/src/msw/app.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/app.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_dataobj.o: $(srcdir)/src/gtk1/dataobj.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/dataobj.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/dataobj.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/dataobj.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_brush.o: $(srcdir)/src/msw/brush.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/brush.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_dataobj.o: $(srcdir)/src/x11/dataobj.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/dataobj.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_brush.o: $(srcdir)/src/msw/brush.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/brush.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_dataobj.o: $(srcdir)/src/motif/dataobj.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/dataobj.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_caret.o: $(srcdir)/src/msw/caret.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/caret.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_caret.o: $(srcdir)/src/msw/caret.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/caret.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/clipbrd.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_dataobj.o: $(srcdir)/src/cocoa/dataobj.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/dataobj.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/clipbrd.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dataobj.o: $(srcdir)/src/os2/dataobj.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dataobj.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_colour.o: $(srcdir)/src/msw/colour.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/colour.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_dc.o: $(srcdir)/src/gtk/dc.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dc.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_colour.o: $(srcdir)/src/msw/colour.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/colour.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_dc.o: $(srcdir)/src/gtk1/dc.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/dc.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_cursor.o: $(srcdir)/src/msw/cursor.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/cursor.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_cursor.o: $(srcdir)/src/msw/cursor.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/cursor.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_data.o: $(srcdir)/src/msw/data.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/data.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_data.o: $(srcdir)/src/msw/data.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/data.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_dc.o: $(srcdir)/src/msw/dc.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_dc.o: $(srcdir)/src/msw/dc.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dc.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_dc.o: $(srcdir)/src/msw/dc.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_dc.o: $(srcdir)/src/msw/dc.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dc.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_dc.o: $(srcdir)/src/x11/dc.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/dc.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dcclient.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_dc.o: $(srcdir)/src/mgl/dc.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/dc.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dcclient.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dc.o: $(srcdir)/src/dfb/dc.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/dc.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_dc.o: $(srcdir)/src/motif/dc.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/dc.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_dc.o: $(srcdir)/src/cocoa/dc.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/dc.mm
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_dcprint.o: $(srcdir)/src/msw/dcprint.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dcprint.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dc.o: $(srcdir)/src/os2/dc.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dc.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_dcprint.o: $(srcdir)/src/msw/dcprint.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dcprint.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_dcclient.o: $(srcdir)/src/gtk/dcclient.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dcclient.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_dcscreen.o: $(srcdir)/src/msw/dcscreen.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dcscreen.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_dcclient.o: $(srcdir)/src/gtk1/dcclient.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/dcclient.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_dcscreen.o: $(srcdir)/src/msw/dcscreen.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dcscreen.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dcclient.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_dialup.o: $(srcdir)/src/msw/dialup.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dcclient.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_dialup.o: $(srcdir)/src/msw/dialup.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_dcclient.o: $(srcdir)/src/x11/dcclient.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/dcclient.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_dib.o: $(srcdir)/src/msw/dib.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dib.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/dcclient.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_dib.o: $(srcdir)/src/msw/dib.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dib.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dcclient.o: $(srcdir)/src/dfb/dcclient.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/dcclient.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_display.o: $(srcdir)/src/msw/display.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/display.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_dcclient.o: $(srcdir)/src/motif/dcclient.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/dcclient.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_display.o: $(srcdir)/src/msw/display.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/display.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_dcclient.o: $(srcdir)/src/cocoa/dcclient.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/dcclient.mm
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_font.o: $(srcdir)/src/msw/font.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/font.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dcclient.o: $(srcdir)/src/os2/dcclient.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dcclient.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_font.o: $(srcdir)/src/msw/font.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/font.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_dcmemory.o: $(srcdir)/src/gtk/dcmemory.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dcmemory.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_dcmemory.o: $(srcdir)/src/gtk1/dcmemory.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/dcmemory.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_dcmemory.o: $(srcdir)/src/x11/dcmemory.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/dcmemory.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_dcmemory.o: $(srcdir)/src/mgl/dcmemory.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/dcmemory.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dcmemory.o: $(srcdir)/src/dfb/dcmemory.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/dcmemory.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_dcmemory.o: $(srcdir)/src/motif/dcmemory.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/dcmemory.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/dcmemory.mm
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_graphics.o: $(srcdir)/src/msw/graphics.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dcmemory.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_graphics.o: $(srcdir)/src/msw/graphics.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_dcscreen.o: $(srcdir)/src/gtk/dcscreen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dcscreen.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_icon.o: $(srcdir)/src/msw/icon.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_dcscreen.o: $(srcdir)/src/gtk1/dcscreen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/dcscreen.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_icon.o: $(srcdir)/src/msw/icon.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_dcscreen.o: $(srcdir)/src/msw/dcscreen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dcscreen.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_dcscreen.o: $(srcdir)/src/msw/dcscreen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dcscreen.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_dcscreen.o: $(srcdir)/src/x11/dcscreen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/dcscreen.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_minifram.o: $(srcdir)/src/msw/minifram.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_dcscreen.o: $(srcdir)/src/mgl/dcscreen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/dcscreen.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_minifram.o: $(srcdir)/src/msw/minifram.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dcscreen.o: $(srcdir)/src/dfb/dcscreen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/dcscreen.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_ole_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/dataobj.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_dcscreen.o: $(srcdir)/src/motif/dcscreen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/dcscreen.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_ole_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/dataobj.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/dropsrc.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/dropsrc.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_dcscreen.o: $(srcdir)/src/cocoa/dcscreen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/dcscreen.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_droptgt.o: $(srcdir)/src/msw/ole/droptgt.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/droptgt.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dcscreen.o: $(srcdir)/src/os2/dcscreen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dcscreen.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_droptgt.o: $(srcdir)/src/msw/ole/droptgt.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/droptgt.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_dnd.o: $(srcdir)/src/gtk/dnd.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dnd.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_dnd.o: $(srcdir)/src/gtk1/dnd.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/dnd.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_dnd.o: $(srcdir)/src/osx/carbon/dnd.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dnd.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_palette.o: $(srcdir)/src/msw/palette.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/palette.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_dnd.o: $(srcdir)/src/osx/carbon/dnd.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dnd.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_palette.o: $(srcdir)/src/msw/palette.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/palette.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dnd.o: $(srcdir)/src/os2/dnd.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dnd.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_pen.o: $(srcdir)/src/msw/pen.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/pen.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_filectrl.o: $(srcdir)/src/gtk/filectrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/filectrl.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_pen.o: $(srcdir)/src/msw/pen.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/pen.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_font.o: $(srcdir)/src/gtk/font.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/font.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_popupwin.o: $(srcdir)/src/msw/popupwin.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/popupwin.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_font.o: $(srcdir)/src/gtk1/font.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/font.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_popupwin.o: $(srcdir)/src/msw/popupwin.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/popupwin.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_font.o: $(srcdir)/src/msw/font.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/font.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_printdlg.o: $(srcdir)/src/msw/printdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/printdlg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_font.o: $(srcdir)/src/msw/font.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/font.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_printdlg.o: $(srcdir)/src/msw/printdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/printdlg.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_font.o: $(srcdir)/src/x11/font.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/font.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_printwin.o: $(srcdir)/src/msw/printwin.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/printwin.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_font.o: $(srcdir)/src/mgl/font.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/font.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_printwin.o: $(srcdir)/src/msw/printwin.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/printwin.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_font.o: $(srcdir)/src/dfb/font.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/font.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_region.o: $(srcdir)/src/msw/region.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/region.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_font.o: $(srcdir)/src/motif/font.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/font.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_region.o: $(srcdir)/src/msw/region.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/region.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_font.o: $(srcdir)/src/osx/carbon/font.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_renderer.o: $(srcdir)/src/msw/renderer.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/renderer.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_font.o: $(srcdir)/src/osx/carbon/font.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_renderer.o: $(srcdir)/src/msw/renderer.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/renderer.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_font.o: $(srcdir)/src/cocoa/font.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/font.mm
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_settings.o: $(srcdir)/src/msw/settings.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/settings.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_font.o: $(srcdir)/src/os2/font.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/font.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_settings.o: $(srcdir)/src/msw/settings.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/settings.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/gsockgtk.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gsockgtk.o: $(srcdir)/src/gtk1/gsockgtk.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/gsockgtk.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_minifram.o: $(srcdir)/src/gtk/minifram.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/minifram.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_minifram.o: $(srcdir)/src/gtk1/minifram.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/minifram.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_minifram.o: $(srcdir)/src/msw/minifram.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_minifram.o: $(srcdir)/src/msw/minifram.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_minifram.o: $(srcdir)/src/osx/minifram.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/uxtheme.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_minifram.o: $(srcdir)/src/osx/minifram.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/uxtheme.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_minifram.o: $(srcdir)/src/x11/minifram.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/minifram.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_window.o: $(srcdir)/src/msw/window.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/window.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_minifram.o: $(srcdir)/src/motif/minifram.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/minifram.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_window.o: $(srcdir)/src/msw/window.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/window.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_minifram.o: $(srcdir)/src/os2/minifram.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/minifram.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_helpchm.o: $(srcdir)/src/msw/helpchm.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/helpchm.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_pen.o: $(srcdir)/src/gtk/pen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/pen.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_helpwin.o: $(srcdir)/src/msw/helpwin.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/helpwin.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_pen.o: $(srcdir)/src/gtk1/pen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/pen.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/automtn.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_pen.o: $(srcdir)/src/x11/pen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/uuid.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_pen.o: $(srcdir)/src/x11/pen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_osx_accel.o: $(srcdir)/src/osx/accel.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/accel.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_pen.o: $(srcdir)/src/msw/pen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/pen.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_osx_accel.o: $(srcdir)/src/osx/accel.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/accel.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_pen.o: $(srcdir)/src/msw/pen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/pen.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_pen.o: $(srcdir)/src/osx/pen.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_pen.o: $(srcdir)/src/osx/pen.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_pen.o: $(srcdir)/src/mgl/pen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/pen.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_pen.o: $(srcdir)/src/dfb/pen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/pen.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_osx_brush.o: $(srcdir)/src/osx/brush.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_pen.o: $(srcdir)/src/cocoa/pen.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/pen.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_osx_brush.o: $(srcdir)/src/osx/brush.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_pen.o: $(srcdir)/src/os2/pen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/pen.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_popupwin.o: $(srcdir)/src/gtk/popupwin.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/popupwin.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_popupwin.o: $(srcdir)/src/gtk1/popupwin.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/popupwin.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_popupwin.o: $(srcdir)/src/msw/popupwin.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/popupwin.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_popupwin.o: $(srcdir)/src/msw/popupwin.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/popupwin.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_popupwin.o: $(srcdir)/src/x11/popupwin.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/popupwin.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_popupwin.o: $(srcdir)/src/motif/popupwin.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/popupwin.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_popupwin.o: $(srcdir)/src/os2/popupwin.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/popupwin.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_private.o: $(srcdir)/src/gtk/private.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/private.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_osx_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_region.o: $(srcdir)/src/gtk/region.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/region.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_osx_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_region.o: $(srcdir)/src/gtk1/region.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/region.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_region.o: $(srcdir)/src/x11/region.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/region.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_region.o: $(srcdir)/src/x11/region.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/region.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_osx_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_region.o: $(srcdir)/src/msw/region.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/region.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_osx_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_region.o: $(srcdir)/src/msw/region.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/region.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_region.o: $(srcdir)/src/mgl/region.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/region.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_region.o: $(srcdir)/src/dfb/region.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/region.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_region.o: $(srcdir)/src/osx/carbon/region.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/region.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_region.o: $(srcdir)/src/cocoa/region.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/region.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_region.o: $(srcdir)/src/os2/region.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/region.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_renderer.o: $(srcdir)/src/gtk/renderer.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/renderer.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_osx_minifram.o: $(srcdir)/src/osx/minifram.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_renderer.o: $(srcdir)/src/gtk1/renderer.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/renderer.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_osx_minifram.o: $(srcdir)/src/osx/minifram.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_renderer.o: $(srcdir)/src/msw/renderer.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/renderer.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_renderer.o: $(srcdir)/src/msw/renderer.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/renderer.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_settings.o: $(srcdir)/src/gtk/settings.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/settings.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_osx_palette.o: $(srcdir)/src/osx/palette.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_settings.o: $(srcdir)/src/gtk1/settings.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/settings.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_osx_palette.o: $(srcdir)/src/osx/palette.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_settings.o: $(srcdir)/src/msw/settings.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/settings.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_osx_pen.o: $(srcdir)/src/osx/pen.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_settings.o: $(srcdir)/src/msw/settings.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/settings.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_osx_pen.o: $(srcdir)/src/osx/pen.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_settings.o: $(srcdir)/src/x11/settings.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/settings.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_settings.o: $(srcdir)/src/mgl/settings.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/settings.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_settings.o: $(srcdir)/src/dfb/settings.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/settings.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_settings.o: $(srcdir)/src/motif/settings.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/settings.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_settings.o: $(srcdir)/src/cocoa/settings.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/settings.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_settings.o: $(srcdir)/src/os2/settings.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/settings.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_tooltip.o: $(srcdir)/src/gtk/tooltip.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/tooltip.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_tooltip.o: $(srcdir)/src/gtk1/tooltip.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/tooltip.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_tooltip.o: $(srcdir)/src/osx/carbon/tooltip.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/tooltip.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_tooltip.o: $(srcdir)/src/osx/cocoa/tooltip.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/tooltip.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_tooltip.o: $(srcdir)/src/cocoa/tooltip.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/tooltip.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_tooltip.o: $(srcdir)/src/os2/tooltip.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/tooltip.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_toplevel.o: $(srcdir)/src/gtk/toplevel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/toplevel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_toplevel.o: $(srcdir)/src/gtk1/toplevel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/toplevel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_toplevel.o: $(srcdir)/src/x11/toplevel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/toplevel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_tabctrl_osx.o: $(srcdir)/src/osx/tabctrl_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/tabctrl_osx.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_toplevel.o: $(srcdir)/src/mgl/toplevel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/toplevel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_tabctrl_osx.o: $(srcdir)/src/osx/tabctrl_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/tabctrl_osx.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_toplevel.o: $(srcdir)/src/dfb/toplevel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/toplevel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_toplevel.o: $(srcdir)/src/motif/toplevel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/toplevel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_toplevel.o: $(srcdir)/src/cocoa/toplevel.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/toplevel.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_toplevel.o: $(srcdir)/src/os2/toplevel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/toplevel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_utilsgtk.o: $(srcdir)/src/gtk/utilsgtk.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/utilsgtk.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_utilsgtk.o: $(srcdir)/src/gtk1/utilsgtk.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/utilsgtk.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_win_gtk.o: $(srcdir)/src/gtk/win_gtk.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/win_gtk.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_win_gtk.o: $(srcdir)/src/gtk1/win_gtk.c $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/gtk1/win_gtk.c
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_window.o: $(srcdir)/src/gtk/window.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/window.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_window.o: $(srcdir)/src/gtk1/window.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/window.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_window.o: $(srcdir)/src/msw/window.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/window.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_window.o: $(srcdir)/src/msw/window.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/window.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_window.o: $(srcdir)/src/x11/window.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/window.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_core_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_window.o: $(srcdir)/src/mgl/window.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/window.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_core_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_window.o: $(srcdir)/src/dfb/window.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/window.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_core_colour.o: $(srcdir)/src/osx/core/colour.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_window.o: $(srcdir)/src/motif/window.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/window.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_core_colour.o: $(srcdir)/src/osx/core/colour.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_window.o: $(srcdir)/src/osx/carbon/window.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/window.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_core_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_window.o: $(srcdir)/src/osx/cocoa/window.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/window.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_core_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_window.o: $(srcdir)/src/cocoa/window.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/window.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_core_display.o: $(srcdir)/src/osx/core/display.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_window.o: $(srcdir)/src/os2/window.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/window.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_core_display.o: $(srcdir)/src/osx/core/display.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_data.o: $(srcdir)/src/gtk1/data.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/data.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_core_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_data.o: $(srcdir)/src/msw/data.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/data.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_core_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_data.o: $(srcdir)/src/msw/data.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/data.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_hid.o: $(srcdir)/src/osx/core/hid.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_data.o: $(srcdir)/src/x11/data.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/data.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_hid.o: $(srcdir)/src/osx/core/hid.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_data.o: $(srcdir)/src/mgl/data.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/data.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_hid.o: $(srcdir)/src/osx/core/hid.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_data.o: $(srcdir)/src/motif/data.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/data.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_data.o: $(srcdir)/src/cocoa/data.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/data.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_data.o: $(srcdir)/src/os2/data.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/data.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_core_timer.o: $(srcdir)/src/osx/core/timer.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_palette.o: $(srcdir)/src/x11/palette.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_core_timer.o: $(srcdir)/src/osx/core/timer.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_palette.o: $(srcdir)/src/x11/palette.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_palette.o: $(srcdir)/src/msw/palette.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/palette.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_palette.o: $(srcdir)/src/msw/palette.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/palette.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_palette.o: $(srcdir)/src/osx/palette.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_generic_timer.o: $(srcdir)/src/generic/timer.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_palette.o: $(srcdir)/src/osx/palette.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_generic_timer.o: $(srcdir)/src/generic/timer.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_palette.o: $(srcdir)/src/mgl/palette.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/palette.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_generic_timer.o: $(srcdir)/src/generic/timer.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_palette.o: $(srcdir)/src/os2/palette.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/palette.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_app.o: $(srcdir)/src/x11/app.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/app.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_clipbrd.o: $(srcdir)/src/x11/clipbrd.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/clipbrd.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_colour.o: $(srcdir)/src/x11/colour.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/colour.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_dcprint.o: $(srcdir)/src/msw/dcprint.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dcprint.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_cursor.o: $(srcdir)/src/x11/cursor.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/cursor.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_dcprint.o: $(srcdir)/src/msw/dcprint.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dcprint.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_data.o: $(srcdir)/src/x11/data.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/data.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_dataobj.o: $(srcdir)/src/x11/dataobj.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/dataobj.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_dc.o: $(srcdir)/src/x11/dc.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/dc.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dcprint.o: $(srcdir)/src/os2/dcprint.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dcprint.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_dcclient.o: $(srcdir)/src/x11/dcclient.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/dcclient.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_dib.o: $(srcdir)/src/msw/dib.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dib.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_dcmemory.o: $(srcdir)/src/x11/dcmemory.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/dcmemory.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_dib.o: $(srcdir)/src/msw/dib.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dib.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_dcscreen.o: $(srcdir)/src/x11/dcscreen.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/dcscreen.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_display.o: $(srcdir)/src/msw/display.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/display.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_evtloop.o: $(srcdir)/src/x11/evtloop.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/evtloop.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_display.o: $(srcdir)/src/msw/display.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/display.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_font.o: $(srcdir)/src/x11/font.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/font.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_display.o: $(srcdir)/src/osx/core/display.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_minifram.o: $(srcdir)/src/x11/minifram.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/minifram.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_display.o: $(srcdir)/src/osx/core/display.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_nanox.o: $(srcdir)/src/x11/nanox.c $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/x11/nanox.c
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_display.o: $(srcdir)/src/cocoa/display.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/display.mm
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_popupwin.o: $(srcdir)/src/x11/popupwin.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/popupwin.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_reparent.o: $(srcdir)/src/x11/reparent.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/reparent.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_settings.o: $(srcdir)/src/x11/settings.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/settings.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_toplevel.o: $(srcdir)/src/x11/toplevel.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/toplevel.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_utils.o: $(srcdir)/src/x11/utils.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/utils.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/gdiimage.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_window.o: $(srcdir)/src/x11/window.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/window.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_generic_colour.o: $(srcdir)/src/generic/colour.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_generic_colour.o: $(srcdir)/src/generic/colour.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mask.o: $(srcdir)/src/generic/mask.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_mask.o: $(srcdir)/src/generic/mask.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_graphics.o: $(srcdir)/src/msw/graphics.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_app.o: $(srcdir)/src/mgl/app.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/app.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_graphics.o: $(srcdir)/src/msw/graphics.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_bitmap.o: $(srcdir)/src/mgl/bitmap.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/bitmap.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_brush.o: $(srcdir)/src/mgl/brush.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/brush.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_clipbrd.o: $(srcdir)/src/mgl/clipbrd.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/clipbrd.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/dropsrc.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_cursor.o: $(srcdir)/src/mgl/cursor.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/cursor.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/dropsrc.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_data.o: $(srcdir)/src/mgl/data.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/data.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_droptgt.o: $(srcdir)/src/msw/ole/droptgt.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/droptgt.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_dc.o: $(srcdir)/src/mgl/dc.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/dc.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_droptgt.o: $(srcdir)/src/msw/ole/droptgt.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/droptgt.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/dcclient.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_dcmemory.o: $(srcdir)/src/mgl/dcmemory.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/dcmemory.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_dcscreen.o: $(srcdir)/src/mgl/dcscreen.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/dcscreen.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_printdlg.o: $(srcdir)/src/msw/printdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/printdlg.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_dirmgl.o: $(srcdir)/src/mgl/dirmgl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/dirmgl.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_printdlg.o: $(srcdir)/src/msw/printdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/printdlg.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/evtloop.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_printdlg.o: $(srcdir)/src/osx/carbon/printdlg.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/printdlg.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_font.o: $(srcdir)/src/mgl/font.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/font.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_printdlg.o: $(srcdir)/src/osx/carbon/printdlg.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/printdlg.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_fontenum.o: $(srcdir)/src/mgl/fontenum.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/fontenum.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_printwin.o: $(srcdir)/src/msw/printwin.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/printwin.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_fontmgr.o: $(srcdir)/src/mgl/fontmgr.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/fontmgr.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_printwin.o: $(srcdir)/src/msw/printwin.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/printwin.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_fontutil.o: $(srcdir)/src/mgl/fontutil.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/fontutil.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_palette.o: $(srcdir)/src/mgl/palette.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/palette.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_pen.o: $(srcdir)/src/mgl/pen.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/pen.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_utilsgui.o: $(srcdir)/src/os2/utilsgui.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/utilsgui.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_region.o: $(srcdir)/src/mgl/region.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/region.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/uxtheme.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_settings.o: $(srcdir)/src/mgl/settings.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/settings.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/uxtheme.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_toplevel.o: $(srcdir)/src/mgl/toplevel.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/toplevel.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_helpchm.o: $(srcdir)/src/msw/helpchm.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/helpchm.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_utils.o: $(srcdir)/src/mgl/utils.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/utils.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_helpwin.o: $(srcdir)/src/msw/helpwin.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/helpwin.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_window.o: $(srcdir)/src/mgl/window.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/window.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_helpwin.o: $(srcdir)/src/os2/helpwin.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/helpwin.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_app.o: $(srcdir)/src/dfb/app.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/app.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/automtn.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_bitmap.o: $(srcdir)/src/dfb/bitmap.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/bitmap.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/uuid.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_brush.o: $(srcdir)/src/dfb/brush.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/brush.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_accel.o: $(srcdir)/src/osx/accel.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/accel.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_cursor.o: $(srcdir)/src/dfb/cursor.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/cursor.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_accel.o: $(srcdir)/src/osx/accel.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/accel.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_dc.o: $(srcdir)/src/dfb/dc.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/dc.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_dcclient.o: $(srcdir)/src/dfb/dcclient.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/dcclient.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_dcmemory.o: $(srcdir)/src/dfb/dcmemory.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/dcmemory.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_dcscreen.o: $(srcdir)/src/dfb/dcscreen.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/dcscreen.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_evtloop.o: $(srcdir)/src/dfb/evtloop.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/evtloop.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/motif/accel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/accel.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_font.o: $(srcdir)/src/dfb/font.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/font.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/msw/accel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_fontenum.o: $(srcdir)/src/dfb/fontenum.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/fontenum.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/msw/accel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_fontmgr.o: $(srcdir)/src/dfb/fontmgr.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/fontmgr.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/os2/accel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/accel.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_nonownedwnd.o: $(srcdir)/src/dfb/nonownedwnd.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/nonownedwnd.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_overlay.o: $(srcdir)/src/dfb/overlay.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/overlay.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_pen.o: $(srcdir)/src/dfb/pen.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/pen.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_region.o: $(srcdir)/src/dfb/region.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/region.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_settings.o: $(srcdir)/src/dfb/settings.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/settings.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_toplevel.o: $(srcdir)/src/dfb/toplevel.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/toplevel.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_utils.o: $(srcdir)/src/dfb/utils.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/utils.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_window.o: $(srcdir)/src/dfb/window.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/window.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_wrapdfb.o: $(srcdir)/src/dfb/wrapdfb.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/wrapdfb.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp
+@COND_PLATFORM_UNIX_1_USE_GUI_1@monolib_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@monolib_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
+@COND_USE_GUI_1_WXUNIV_1@monolib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp
+@COND_USE_GUI_1_WXUNIV_1@monolib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp
+@COND_USE_GUI_1_WXUNIV_1@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp
+@COND_USE_GUI_1_WXUNIV_1@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_tabctrl_osx.o: $(srcdir)/src/osx/tabctrl_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/tabctrl_osx.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_tabctrl_osx.o: $(srcdir)/src/osx/tabctrl_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/tabctrl_osx.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp
+@COND_USE_GUI_1_WXUNIV_1@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_hid.o: $(srcdir)/src/osx/core/hid.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_hid.o: $(srcdir)/src/osx/core/hid.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_hid.o: $(srcdir)/src/osx/core/hid.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
+@COND_USE_GUI_1_WXUNIV_1@monolib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_nanox.o: $(srcdir)/src/x11/nanox.c $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/x11/nanox.c
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_reparent.o: $(srcdir)/src/x11/reparent.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/reparent.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mask.o: $(srcdir)/src/generic/mask.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_mask.o: $(srcdir)/src/generic/mask.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
+@COND_USE_GUI_1_WXUNIV_1@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_dirmgl.o: $(srcdir)/src/mgl/dirmgl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/dirmgl.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_fontmgr.o: $(srcdir)/src/mgl/fontmgr.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/fontmgr.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_fontmgr.o: $(srcdir)/src/dfb/fontmgr.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/fontmgr.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_nonownedwnd.o: $(srcdir)/src/dfb/nonownedwnd.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/nonownedwnd.cpp
+@COND_USE_GUI_1_WXUNIV_1@monolib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_nonownedwnd.o: $(srcdir)/src/osx/carbon/nonownedwnd.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/nonownedwnd.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_nonownedwnd.o: $(srcdir)/src/osx/cocoa/nonownedwnd.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/nonownedwnd.mm
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_overlay.o: $(srcdir)/src/dfb/overlay.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/overlay.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_wrapdfb.o: $(srcdir)/src/dfb/wrapdfb.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/wrapdfb.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-@COND_PLATFORM_UNIX_1_USE_GUI_1@monolib_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@monolib_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_USE_GUI_1_WXUNIV_1@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_fdrepdlg.o: $(srcdir)/src/msw/fdrepdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/fdrepdlg.cpp
+@COND_USE_GUI_1_WXUNIV_1@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_USE_GUI_1_WXUNIV_1@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_USE_GUI_1_WXUNIV_1@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_USE_GUI_1_WXUNIV_1@monolib_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_listctrl.o: $(srcdir)/src/msw/listctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/listctrl.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_listctrl.o: $(srcdir)/src/msw/listctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/listctrl.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_USE_GUI_1_WXUNIV_1@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_button.o: $(srcdir)/src/msw/button.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/button.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_button.o: $(srcdir)/src/msw/button.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/button.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/checkbox.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/checkbox.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_choice.o: $(srcdir)/src/msw/choice.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/choice.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_choice.o: $(srcdir)/src/msw/choice.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/choice.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/colordlg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/colordlg.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_combo.o: $(srcdir)/src/msw/combo.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/combo.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_combo.o: $(srcdir)/src/msw/combo.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/combo.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_combobox.o: $(srcdir)/src/msw/combobox.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/combobox.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_combobox.o: $(srcdir)/src/msw/combobox.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/combobox.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_statusbr.o: $(srcdir)/src/univ/statusbr.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/statusbr.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_control.o: $(srcdir)/src/msw/control.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/control.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_control.o: $(srcdir)/src/msw/control.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/control.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_dialog.o: $(srcdir)/src/msw/dialog.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dialog.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_dialog.o: $(srcdir)/src/msw/dialog.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dialog.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_dirdlg.o: $(srcdir)/src/msw/dirdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dirdlg.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_dirdlg.o: $(srcdir)/src/msw/dirdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dirdlg.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_frame.o: $(srcdir)/src/msw/frame.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/frame.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_frame.o: $(srcdir)/src/msw/frame.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/frame.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_gauge.o: $(srcdir)/src/msw/gauge.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_gauge.o: $(srcdir)/src/msw/gauge.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_listbox.o: $(srcdir)/src/msw/listbox.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/listbox.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_listbox.o: $(srcdir)/src/msw/listbox.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/listbox.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_listctrl.o: $(srcdir)/src/msw/listctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/listctrl.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_listctrl.o: $(srcdir)/src/msw/listctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/listctrl.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_bmpbuttn.o: $(srcdir)/src/gtk/bmpbuttn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/bmpbuttn.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_mdi.o: $(srcdir)/src/msw/mdi.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mdi.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_bmpbuttn.o: $(srcdir)/src/gtk1/bmpbuttn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/bmpbuttn.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_mdi.o: $(srcdir)/src/msw/mdi.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mdi.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_bmpbuttn.o: $(srcdir)/src/motif/bmpbuttn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/bmpbuttn.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_menu.o: $(srcdir)/src/msw/menu.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/menu.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_menu.o: $(srcdir)/src/msw/menu.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/menu.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_menuitem.o: $(srcdir)/src/msw/menuitem.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/menuitem.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_bmpbuttn.o: $(srcdir)/src/osx/carbon/bmpbuttn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/bmpbuttn.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_menuitem.o: $(srcdir)/src/msw/menuitem.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/menuitem.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_bmpbuttn.o: $(srcdir)/src/osx/cocoa/bmpbuttn.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/bmpbuttn.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_metafile.o: $(srcdir)/src/msw/metafile.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/metafile.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_bmpbuttn.o: $(srcdir)/src/cocoa/bmpbuttn.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/bmpbuttn.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_metafile.o: $(srcdir)/src/msw/metafile.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/metafile.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_bmpbuttn.o: $(srcdir)/src/os2/bmpbuttn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/bmpbuttn.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/msgdlg.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_bmpbuttn.o: $(srcdir)/src/univ/bmpbuttn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/bmpbuttn.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/msgdlg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_button.o: $(srcdir)/src/gtk/button.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/button.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_button.o: $(srcdir)/src/gtk1/button.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/button.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_button.o: $(srcdir)/src/motif/button.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/button.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/nativewin.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_button.o: $(srcdir)/src/msw/button.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/button.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/nativewin.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_button.o: $(srcdir)/src/msw/button.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/button.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_notebook.o: $(srcdir)/src/msw/notebook.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/notebook.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_button.o: $(srcdir)/src/osx/carbon/button.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/button.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_notebook.o: $(srcdir)/src/msw/notebook.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/notebook.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_button.o: $(srcdir)/src/osx/cocoa/button.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/button.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_access.o: $(srcdir)/src/msw/ole/access.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_button.o: $(srcdir)/src/cocoa/button.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/button.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_access.o: $(srcdir)/src/msw/ole/access.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_button.o: $(srcdir)/src/os2/button.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/button.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_button.o: $(srcdir)/src/univ/button.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/button.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_checkbox.o: $(srcdir)/src/gtk/checkbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/checkbox.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/radiobox.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_checkbox.o: $(srcdir)/src/gtk1/checkbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/checkbox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/radiobox.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_checkbox.o: $(srcdir)/src/motif/checkbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/checkbox.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/radiobut.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/checkbox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/radiobut.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/checkbox.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_checkbox.o: $(srcdir)/src/osx/carbon/checkbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/checkbox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_checkbox.o: $(srcdir)/src/osx/cocoa/checkbox.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/checkbox.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_slider.o: $(srcdir)/src/msw/slider.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_checkbox.o: $(srcdir)/src/cocoa/checkbox.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/checkbox.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_slider.o: $(srcdir)/src/msw/slider.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_checkbox.o: $(srcdir)/src/os2/checkbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/checkbox.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/spinbutt.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_checkbox.o: $(srcdir)/src/univ/checkbox.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/checkbox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/spinbutt.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_checklst.o: $(srcdir)/src/gtk/checklst.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/checklst.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_checklst.o: $(srcdir)/src/gtk1/checklst.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/checklst.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_checklst.o: $(srcdir)/src/motif/checklst.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/checklst.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statbmp.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_checklst.o: $(srcdir)/src/msw/checklst.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statbmp.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_checklst.o: $(srcdir)/src/msw/wince/checklst.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/wince/checklst.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_statbox.o: $(srcdir)/src/msw/statbox.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_checklst.o: $(srcdir)/src/cocoa/checklst.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/checklst.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_statbox.o: $(srcdir)/src/msw/statbox.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_checklst.o: $(srcdir)/src/os2/checklst.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/checklst.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_checklst.o: $(srcdir)/src/univ/checklst.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/checklst.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_choice.o: $(srcdir)/src/gtk/choice.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/choice.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_statline.o: $(srcdir)/src/msw/statline.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statline.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_choice.o: $(srcdir)/src/gtk1/choice.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/choice.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_statline.o: $(srcdir)/src/msw/statline.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statline.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_choice.o: $(srcdir)/src/motif/choice.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/choice.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_stattext.o: $(srcdir)/src/msw/stattext.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_choice.o: $(srcdir)/src/msw/choice.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/choice.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_stattext.o: $(srcdir)/src/msw/stattext.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_choice.o: $(srcdir)/src/msw/choice.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/choice.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/tabctrl.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_choice.o: $(srcdir)/src/osx/carbon/choice.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/choice.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/tabctrl.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_choice.o: $(srcdir)/src/osx/cocoa/choice.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/choice.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_choice.o: $(srcdir)/src/cocoa/choice.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/choice.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_choice.o: $(srcdir)/src/os2/choice.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/choice.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/textctrl.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_choice.o: $(srcdir)/src/univ/choice.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/choice.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/textctrl.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_colordlg.o: $(srcdir)/src/gtk/colordlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/colordlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_textentry.o: $(srcdir)/src/msw/textentry.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/colordlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_textentry.o: $(srcdir)/src/msw/textentry.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/colordlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/tglbtn.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_colordlg.o: $(srcdir)/src/osx/carbon/colordlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/colordlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/tglbtn.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_colordlg.o: $(srcdir)/src/cocoa/colordlg.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/colordlg.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_combobox.o: $(srcdir)/src/gtk/combobox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/combobox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_combobox.o: $(srcdir)/src/gtk1/combobox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_combobox.o: $(srcdir)/src/motif/combobox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_combobox.o: $(srcdir)/src/msw/combobox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_combobox.o: $(srcdir)/src/msw/combobox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_combobox.o: $(srcdir)/src/cocoa/combobox.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/combobox.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_combobox.o: $(srcdir)/src/os2/combobox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_combobox.o: $(srcdir)/src/univ/combobox.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_control.o: $(srcdir)/src/gtk/control.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_control.o: $(srcdir)/src/gtk1/control.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_control.o: $(srcdir)/src/motif/control.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_control.o: $(srcdir)/src/msw/control.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_control.o: $(srcdir)/src/msw/control.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_control.o: $(srcdir)/src/osx/carbon/control.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_app.o: $(srcdir)/src/osx/carbon/app.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_control.o: $(srcdir)/src/osx/carbon/control.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_app.o: $(srcdir)/src/osx/carbon/app.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_control.o: $(srcdir)/src/cocoa/control.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/control.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_control.o: $(srcdir)/src/os2/control.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_control.o: $(srcdir)/src/univ/control.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_control.o: $(srcdir)/src/osx/carbon/control.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_dialog.o: $(srcdir)/src/gtk/dialog.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dialog.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_control.o: $(srcdir)/src/osx/carbon/control.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_dialog.o: $(srcdir)/src/gtk1/dialog.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/dialog.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_dialog.o: $(srcdir)/src/motif/dialog.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/dialog.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_dialog.o: $(srcdir)/src/msw/dialog.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dialog.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_dialog.o: $(srcdir)/src/msw/dialog.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dialog.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_dialog.o: $(srcdir)/src/osx/carbon/dialog.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dialog.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_dialog.o: $(srcdir)/src/osx/cocoa/dialog.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/dialog.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_dialog.o: $(srcdir)/src/cocoa/dialog.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/dialog.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dialog.o: $(srcdir)/src/os2/dialog.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dialog.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_dialog.o: $(srcdir)/src/univ/dialog.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/dialog.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_dirdlg.o: $(srcdir)/src/gtk/dirdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dirdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_dirdlg.o: $(srcdir)/src/msw/dirdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dirdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_dnd.o: $(srcdir)/src/osx/carbon/dnd.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dnd.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_dirdlg.o: $(srcdir)/src/msw/dirdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dirdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_dnd.o: $(srcdir)/src/osx/carbon/dnd.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dnd.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_dirdlg.o: $(srcdir)/src/osx/carbon/dirdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dirdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_font.o: $(srcdir)/src/osx/carbon/font.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_dirdlg.o: $(srcdir)/src/osx/cocoa/dirdlg.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/dirdlg.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_font.o: $(srcdir)/src/osx/carbon/font.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_dirdlg.o: $(srcdir)/src/cocoa/dirdlg.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/dirdlg.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/gtk/filedlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/filedlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/gtk1/filedlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/filedlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_mdi.o: $(srcdir)/src/osx/carbon/mdi.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/mdi.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/motif/filedlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/filedlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_mdi.o: $(srcdir)/src/osx/carbon/mdi.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/mdi.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/osx/carbon/filedlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/filedlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/osx/cocoa/filedlg.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/filedlg.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/cocoa/filedlg.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/filedlg.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/os2/filedlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/filedlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_fontdlg.o: $(srcdir)/src/gtk/fontdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/fontdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_printdlg.o: $(srcdir)/src/osx/carbon/printdlg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/printdlg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_fontdlg.o: $(srcdir)/src/gtk1/fontdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/fontdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_printdlg.o: $(srcdir)/src/osx/carbon/printdlg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/printdlg.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_fontdlg.o: $(srcdir)/src/msw/fontdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/fontdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontdlg.o: $(srcdir)/src/cocoa/fontdlg.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/fontdlg.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_fontdlg.o: $(srcdir)/src/os2/fontdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/fontdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_frame.o: $(srcdir)/src/gtk/frame.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/frame.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_frame.o: $(srcdir)/src/gtk1/frame.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/frame.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_tabctrl.o: $(srcdir)/src/osx/carbon/tabctrl.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/tabctrl.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_frame.o: $(srcdir)/src/motif/frame.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/frame.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_tabctrl.o: $(srcdir)/src/osx/carbon/tabctrl.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/tabctrl.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_frame.o: $(srcdir)/src/msw/frame.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/frame.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_frame.o: $(srcdir)/src/msw/frame.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/frame.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_regiong.o: $(srcdir)/src/generic/regiong.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_regiong.o: $(srcdir)/src/generic/regiong.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_frame.o: $(srcdir)/src/cocoa/frame.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/frame.mm
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_frame.o: $(srcdir)/src/os2/frame.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/frame.cpp
+@COND_USE_GUI_1_WXUNIV_1@monolib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/gtk/gauge.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/gauge.cpp
+@COND_USE_GUI_1@monolib_accelcmn.o: $(srcdir)/src/common/accelcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/accelcmn.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/gtk1/gauge.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/gauge.cpp
+@COND_USE_GUI_1@monolib_accesscmn.o: $(srcdir)/src/common/accesscmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/accesscmn.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/motif/gauge.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/gauge.cpp
+@COND_USE_GUI_1@monolib_anidecod.o: $(srcdir)/src/common/anidecod.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/anidecod.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/msw/gauge.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
+@COND_USE_GUI_1@monolib_appcmn.o: $(srcdir)/src/common/appcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/appcmn.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/msw/gauge.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
+@COND_USE_GUI_1@monolib_artprov.o: $(srcdir)/src/common/artprov.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/artprov.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/osx/carbon/gauge.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/gauge.cpp
+@COND_USE_GUI_1@monolib_artstd.o: $(srcdir)/src/common/artstd.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/artstd.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/osx/cocoa/gauge.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/gauge.mm
+@COND_USE_GUI_1@monolib_bmpbase.o: $(srcdir)/src/common/bmpbase.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/bmpbase.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/cocoa/gauge.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/gauge.mm
+@COND_USE_GUI_1@monolib_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/bookctrl.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/os2/gauge.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/gauge.cpp
+@COND_USE_GUI_1@monolib_btncmn.o: $(srcdir)/src/common/btncmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/btncmn.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_gauge.o: $(srcdir)/src/univ/gauge.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/gauge.cpp
+@COND_USE_GUI_1@monolib_cairo.o: $(srcdir)/src/common/cairo.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/cairo.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_print.o: $(srcdir)/src/gtk/print.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/print.cpp
+@COND_USE_GUI_1@monolib_choiccmn.o: $(srcdir)/src/common/choiccmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/choiccmn.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_print.o: $(srcdir)/src/os2/print.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/print.cpp
+@COND_USE_GUI_1@monolib_clipcmn.o: $(srcdir)/src/common/clipcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/clipcmn.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_listbox.o: $(srcdir)/src/gtk/listbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/listbox.cpp
+@COND_USE_GUI_1@monolib_clrpickercmn.o: $(srcdir)/src/common/clrpickercmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/clrpickercmn.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_listbox.o: $(srcdir)/src/gtk1/listbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/listbox.cpp
+@COND_USE_GUI_1@monolib_colourcmn.o: $(srcdir)/src/common/colourcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/colourcmn.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_listbox.o: $(srcdir)/src/motif/listbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/listbox.cpp
+@COND_USE_GUI_1@monolib_combocmn.o: $(srcdir)/src/common/combocmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/combocmn.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_listbox.o: $(srcdir)/src/msw/listbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/listbox.cpp
+@COND_USE_GUI_1@monolib_cmdproc.o: $(srcdir)/src/common/cmdproc.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/cmdproc.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_listbox.o: $(srcdir)/src/msw/listbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/listbox.cpp
+@COND_USE_GUI_1@monolib_cmndata.o: $(srcdir)/src/common/cmndata.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/cmndata.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_listbox.o: $(srcdir)/src/osx/carbon/listbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/listbox.cpp
+@COND_USE_GUI_1@monolib_containr.o: $(srcdir)/src/common/containr.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/containr.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_listbox.o: $(srcdir)/src/osx/cocoa/listbox.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/listbox.mm
+@COND_USE_GUI_1@monolib_cshelp.o: $(srcdir)/src/common/cshelp.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/cshelp.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_listbox.o: $(srcdir)/src/cocoa/listbox.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/listbox.mm
+@COND_USE_GUI_1@monolib_ctrlcmn.o: $(srcdir)/src/common/ctrlcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/ctrlcmn.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_listbox.o: $(srcdir)/src/os2/listbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/listbox.cpp
+@COND_USE_GUI_1@monolib_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/ctrlsub.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_listbox.o: $(srcdir)/src/univ/listbox.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/listbox.cpp
+@COND_USE_GUI_1@monolib_datacmn.o: $(srcdir)/src/common/datacmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/datacmn.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_mdi.o: $(srcdir)/src/gtk/mdi.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/mdi.cpp
+@COND_USE_GUI_1@monolib_dcbase.o: $(srcdir)/src/common/dcbase.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dcbase.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_mdi.o: $(srcdir)/src/gtk1/mdi.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/mdi.cpp
+@COND_USE_GUI_1@monolib_dcbufcmn.o: $(srcdir)/src/common/dcbufcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dcbufcmn.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_mdi.o: $(srcdir)/src/motif/mdi.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/mdi.cpp
+@COND_USE_GUI_1@monolib_dcgraph.o: $(srcdir)/src/common/dcgraph.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dcgraph.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_mdi.o: $(srcdir)/src/msw/mdi.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mdi.cpp
+@COND_USE_GUI_1@monolib_dcsvg.o: $(srcdir)/src/common/dcsvg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dcsvg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_mdi.o: $(srcdir)/src/msw/mdi.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mdi.cpp
+@COND_USE_GUI_1@monolib_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dlgcmn.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_mdi.o: $(srcdir)/src/osx/carbon/mdi.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/mdi.cpp
+@COND_USE_GUI_1@monolib_dndcmn.o: $(srcdir)/src/common/dndcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dndcmn.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_mdi.o: $(srcdir)/src/osx/carbon/mdi.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/mdi.cpp
+@COND_USE_GUI_1@monolib_dobjcmn.o: $(srcdir)/src/common/dobjcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dobjcmn.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_mdi.o: $(srcdir)/src/cocoa/mdi.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/mdi.mm
+@COND_USE_GUI_1@monolib_docmdi.o: $(srcdir)/src/common/docmdi.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/docmdi.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_menu.o: $(srcdir)/src/gtk/menu.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/menu.cpp
+@COND_USE_GUI_1@monolib_docview.o: $(srcdir)/src/common/docview.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/docview.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_menu.o: $(srcdir)/src/gtk1/menu.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/menu.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_menu.o: $(srcdir)/src/motif/menu.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/menu.cpp
+@COND_USE_GUI_1@monolib_dpycmn.o: $(srcdir)/src/common/dpycmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dpycmn.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_menu.o: $(srcdir)/src/msw/menu.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/menu.cpp
+@COND_USE_GUI_1@monolib_dseldlg.o: $(srcdir)/src/common/dseldlg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dseldlg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_menu.o: $(srcdir)/src/msw/menu.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/menu.cpp
+@COND_USE_GUI_1@monolib_effects.o: $(srcdir)/src/common/effects.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/effects.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_menu.o: $(srcdir)/src/osx/carbon/menu.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/menu.cpp
+@COND_USE_GUI_1@monolib_fddlgcmn.o: $(srcdir)/src/common/fddlgcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fddlgcmn.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_menu.o: $(srcdir)/src/osx/cocoa/menu.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/menu.mm
+@COND_USE_GUI_1@monolib_filectrlcmn.o: $(srcdir)/src/common/filectrlcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/filectrlcmn.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_menu.o: $(srcdir)/src/cocoa/menu.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/menu.mm
+@COND_USE_GUI_1@monolib_filepickercmn.o: $(srcdir)/src/common/filepickercmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/filepickercmn.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_menu.o: $(srcdir)/src/os2/menu.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/menu.cpp
+@COND_USE_GUI_1@monolib_fontpickercmn.o: $(srcdir)/src/common/fontpickercmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontpickercmn.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_menu.o: $(srcdir)/src/univ/menu.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/menu.cpp
+@COND_USE_GUI_1@monolib_fldlgcmn.o: $(srcdir)/src/common/fldlgcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fldlgcmn.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_msgdlg.o: $(srcdir)/src/gtk/msgdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/msgdlg.cpp
+@COND_USE_GUI_1@monolib_fontcmn.o: $(srcdir)/src/common/fontcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontcmn.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_msgdlg.o: $(srcdir)/src/motif/msgdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/msgdlg.cpp
+@COND_USE_GUI_1@monolib_fontenumcmn.o: $(srcdir)/src/common/fontenumcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontenumcmn.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/msgdlg.cpp
+@COND_USE_GUI_1@monolib_fontmap.o: $(srcdir)/src/common/fontmap.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontmap.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/msgdlg.cpp
+@COND_USE_GUI_1@monolib_fontutilcmn.o: $(srcdir)/src/common/fontutilcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontutilcmn.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_msgdlg.o: $(srcdir)/src/osx/carbon/msgdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/msgdlg.cpp
+@COND_USE_GUI_1@monolib_framecmn.o: $(srcdir)/src/common/framecmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/framecmn.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_msgdlg.o: $(srcdir)/src/osx/cocoa/msgdlg.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/msgdlg.mm
+@COND_USE_GUI_1@monolib_gaugecmn.o: $(srcdir)/src/common/gaugecmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/gaugecmn.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_msgdlg.o: $(srcdir)/src/cocoa/msgdlg.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/msgdlg.mm
+@COND_USE_GUI_1@monolib_gbsizer.o: $(srcdir)/src/common/gbsizer.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/gbsizer.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_msgdlg.o: $(srcdir)/src/os2/msgdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/msgdlg.cpp
+@COND_USE_GUI_1@monolib_gdicmn.o: $(srcdir)/src/common/gdicmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/gdicmn.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_nativewin.o: $(srcdir)/src/gtk/nativewin.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/nativewin.cpp
+@COND_USE_GUI_1@monolib_geometry.o: $(srcdir)/src/common/geometry.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/geometry.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/nativewin.cpp
+@COND_USE_GUI_1@monolib_gifdecod.o: $(srcdir)/src/common/gifdecod.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/gifdecod.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/nativewin.cpp
+@COND_USE_GUI_1@monolib_graphcmn.o: $(srcdir)/src/common/graphcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/graphcmn.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_notebook.o: $(srcdir)/src/gtk/notebook.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/notebook.cpp
+@COND_USE_GUI_1@monolib_helpbase.o: $(srcdir)/src/common/helpbase.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/helpbase.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_notebook.o: $(srcdir)/src/gtk1/notebook.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/notebook.cpp
+@COND_USE_GUI_1@monolib_iconbndl.o: $(srcdir)/src/common/iconbndl.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/iconbndl.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_notebook.o: $(srcdir)/src/generic/notebook.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/notebook.cpp
+@COND_USE_GUI_1@monolib_imagall.o: $(srcdir)/src/common/imagall.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/imagall.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_notebook.o: $(srcdir)/src/msw/notebook.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/notebook.cpp
+@COND_USE_GUI_1@monolib_imagbmp.o: $(srcdir)/src/common/imagbmp.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/imagbmp.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_notebook.o: $(srcdir)/src/msw/notebook.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/notebook.cpp
+@COND_USE_GUI_1@monolib_image.o: $(srcdir)/src/common/image.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/image.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_notebook.o: $(srcdir)/src/osx/cocoa/notebook.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/notebook.mm
+@COND_USE_GUI_1@monolib_imagfill.o: $(srcdir)/src/common/imagfill.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/imagfill.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_notebook.o: $(srcdir)/src/cocoa/notebook.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/notebook.mm
+@COND_USE_GUI_1@monolib_imaggif.o: $(srcdir)/src/common/imaggif.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/imaggif.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_notebook.o: $(srcdir)/src/os2/notebook.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/notebook.cpp
+@COND_USE_GUI_1@monolib_imagiff.o: $(srcdir)/src/common/imagiff.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/imagiff.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_notebook.o: $(srcdir)/src/univ/notebook.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/notebook.cpp
+@COND_USE_GUI_1@monolib_imagjpeg.o: $(srcdir)/src/common/imagjpeg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/imagjpeg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_radiobox.o: $(srcdir)/src/gtk/radiobox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/radiobox.cpp
+@COND_USE_GUI_1@monolib_imagpcx.o: $(srcdir)/src/common/imagpcx.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/imagpcx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_radiobox.o: $(srcdir)/src/gtk1/radiobox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/radiobox.cpp
+@COND_USE_GUI_1@monolib_imagpng.o: $(srcdir)/src/common/imagpng.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/imagpng.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_radiobox.o: $(srcdir)/src/motif/radiobox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/radiobox.cpp
+@COND_USE_GUI_1@monolib_imagpnm.o: $(srcdir)/src/common/imagpnm.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/imagpnm.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/radiobox.cpp
+@COND_USE_GUI_1@monolib_imagtga.o: $(srcdir)/src/common/imagtga.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/imagtga.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/radiobox.cpp
+@COND_USE_GUI_1@monolib_imagtiff.o: $(srcdir)/src/common/imagtiff.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/imagtiff.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_radiobox.o: $(srcdir)/src/cocoa/radiobox.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/radiobox.mm
+@COND_USE_GUI_1@monolib_imagxpm.o: $(srcdir)/src/common/imagxpm.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/imagxpm.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_radiobox.o: $(srcdir)/src/os2/radiobox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/radiobox.cpp
+@COND_USE_GUI_1@monolib_layout.o: $(srcdir)/src/common/layout.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/layout.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_radiobox.o: $(srcdir)/src/univ/radiobox.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/radiobox.cpp
+@COND_USE_GUI_1@monolib_lboxcmn.o: $(srcdir)/src/common/lboxcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/lboxcmn.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_radiobut.o: $(srcdir)/src/gtk/radiobut.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/radiobut.cpp
+@COND_USE_GUI_1@monolib_listctrlcmn.o: $(srcdir)/src/common/listctrlcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/listctrlcmn.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_radiobut.o: $(srcdir)/src/gtk1/radiobut.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/radiobut.cpp
+@COND_USE_GUI_1@monolib_matrix.o: $(srcdir)/src/common/matrix.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/matrix.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_radiobut.o: $(srcdir)/src/motif/radiobut.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/radiobut.cpp
+@COND_USE_GUI_1@monolib_menucmn.o: $(srcdir)/src/common/menucmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/menucmn.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/radiobut.cpp
+@COND_USE_GUI_1@monolib_nbkbase.o: $(srcdir)/src/common/nbkbase.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/nbkbase.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/radiobut.cpp
+@COND_USE_GUI_1@monolib_overlaycmn.o: $(srcdir)/src/common/overlaycmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/overlaycmn.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_radiobut.o: $(srcdir)/src/osx/carbon/radiobut.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/radiobut.cpp
+@COND_USE_GUI_1@monolib_paper.o: $(srcdir)/src/common/paper.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/paper.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_radiobut.o: $(srcdir)/src/osx/cocoa/radiobut.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/radiobut.mm
+@COND_USE_GUI_1@monolib_pickerbase.o: $(srcdir)/src/common/pickerbase.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/pickerbase.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_radiobut.o: $(srcdir)/src/cocoa/radiobut.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/radiobut.mm
+@COND_USE_GUI_1@monolib_popupcmn.o: $(srcdir)/src/common/popupcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/popupcmn.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_radiobut.o: $(srcdir)/src/os2/radiobut.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/radiobut.cpp
+@COND_USE_GUI_1@monolib_prntbase.o: $(srcdir)/src/common/prntbase.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/prntbase.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_radiobut.o: $(srcdir)/src/univ/radiobut.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/radiobut.cpp
+@COND_USE_GUI_1@monolib_quantize.o: $(srcdir)/src/common/quantize.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/quantize.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_scrolbar.o: $(srcdir)/src/gtk/scrolbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/scrolbar.cpp
+@COND_USE_GUI_1@monolib_radiocmn.o: $(srcdir)/src/common/radiocmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/radiocmn.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_scrolbar.o: $(srcdir)/src/gtk1/scrolbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/scrolbar.cpp
+@COND_USE_GUI_1@monolib_rendcmn.o: $(srcdir)/src/common/rendcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/rendcmn.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_scrolbar.o: $(srcdir)/src/motif/scrolbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/scrolbar.cpp
+@COND_USE_GUI_1@monolib_rgncmn.o: $(srcdir)/src/common/rgncmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/rgncmn.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp
+@COND_USE_GUI_1@monolib_settcmn.o: $(srcdir)/src/common/settcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/settcmn.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp
+@COND_USE_GUI_1@monolib_sizer.o: $(srcdir)/src/common/sizer.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/sizer.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_scrolbar.o: $(srcdir)/src/osx/carbon/scrolbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/scrolbar.cpp
+@COND_USE_GUI_1@monolib_srchcmn.o: $(srcdir)/src/common/srchcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/srchcmn.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_scrolbar.o: $(srcdir)/src/osx/cocoa/scrolbar.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/scrolbar.mm
+@COND_USE_GUI_1@monolib_statbar.o: $(srcdir)/src/common/statbar.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/statbar.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_scrolbar.o: $(srcdir)/src/cocoa/scrolbar.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/scrolbar.mm
+@COND_USE_GUI_1@monolib_stattextcmn.o: $(srcdir)/src/common/stattextcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/stattextcmn.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/scrolbar.cpp
+@COND_USE_GUI_1@monolib_stockitem.o: $(srcdir)/src/common/stockitem.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/stockitem.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_scrolbar.o: $(srcdir)/src/univ/scrolbar.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/scrolbar.cpp
+@COND_USE_GUI_1@monolib_tbarbase.o: $(srcdir)/src/common/tbarbase.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/tbarbase.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_scrolwin.o: $(srcdir)/src/gtk/scrolwin.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/scrolwin.cpp
+@COND_USE_GUI_1@monolib_textcmn.o: $(srcdir)/src/common/textcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/textcmn.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_scrolwin.o: $(srcdir)/src/gtk1/scrolwin.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/scrolwin.cpp
+@COND_USE_GUI_1@monolib_textentrycmn.o: $(srcdir)/src/common/textentrycmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/textentrycmn.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/gtk/slider.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/slider.cpp
+@COND_USE_GUI_1@monolib_toplvcmn.o: $(srcdir)/src/common/toplvcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/toplvcmn.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/gtk1/slider.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/slider.cpp
+@COND_USE_GUI_1@monolib_treebase.o: $(srcdir)/src/common/treebase.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/treebase.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/motif/slider.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/slider.cpp
+@COND_USE_GUI_1@monolib_valgen.o: $(srcdir)/src/common/valgen.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/valgen.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/msw/slider.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
+@COND_USE_GUI_1@monolib_validate.o: $(srcdir)/src/common/validate.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/validate.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/msw/slider.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
+@COND_USE_GUI_1@monolib_valtext.o: $(srcdir)/src/common/valtext.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/valtext.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/osx/carbon/slider.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/slider.cpp
+@COND_USE_GUI_1@monolib_wincmn.o: $(srcdir)/src/common/wincmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/wincmn.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/osx/cocoa/slider.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/slider.mm
+@COND_USE_GUI_1@monolib_windowid.o: $(srcdir)/src/common/windowid.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/windowid.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/cocoa/slider.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/slider.mm
+@COND_USE_GUI_1@monolib_wrapsizer.o: $(srcdir)/src/common/wrapsizer.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/wrapsizer.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/os2/slider.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/slider.cpp
+@COND_USE_GUI_1@monolib_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/xpmdecod.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_slider.o: $(srcdir)/src/univ/slider.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/slider.cpp
+@COND_USE_GUI_1@monolib_busyinfo.o: $(srcdir)/src/generic/busyinfo.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/busyinfo.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_spinbutt.o: $(srcdir)/src/gtk/spinbutt.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/spinbutt.cpp
+@COND_USE_GUI_1@monolib_buttonbar.o: $(srcdir)/src/generic/buttonbar.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/buttonbar.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_spinbutt.o: $(srcdir)/src/gtk1/spinbutt.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/spinbutt.cpp
+@COND_USE_GUI_1@monolib_choicdgg.o: $(srcdir)/src/generic/choicdgg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/choicdgg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_spinbutt.o: $(srcdir)/src/motif/spinbutt.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/spinbutt.cpp
+@COND_USE_GUI_1@monolib_choicbkg.o: $(srcdir)/src/generic/choicbkg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/choicbkg.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/spinbutt.cpp
+@COND_USE_GUI_1@monolib_combog.o: $(srcdir)/src/generic/combog.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/combog.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/spinbutt.cpp
+@COND_USE_GUI_1@monolib_dcpsg.o: $(srcdir)/src/generic/dcpsg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dcpsg.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_spinbutt.o: $(srcdir)/src/osx/carbon/spinbutt.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/spinbutt.cpp
+@COND_USE_GUI_1@monolib_dirctrlg.o: $(srcdir)/src/generic/dirctrlg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dirctrlg.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_spinbutt.o: $(srcdir)/src/osx/cocoa/spinbutt.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/spinbutt.mm
+@COND_USE_GUI_1@monolib_dragimgg.o: $(srcdir)/src/generic/dragimgg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dragimgg.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_spinbutt.o: $(srcdir)/src/cocoa/spinbutt.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/spinbutt.mm
+@COND_USE_GUI_1@monolib_filectrlg.o: $(srcdir)/src/generic/filectrlg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filectrlg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_spinbutt.o: $(srcdir)/src/os2/spinbutt.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/spinbutt.cpp
+@COND_USE_GUI_1@monolib_listbkg.o: $(srcdir)/src/generic/listbkg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listbkg.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_spinbutt.o: $(srcdir)/src/univ/spinbutt.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/spinbutt.cpp
+@COND_USE_GUI_1@monolib_logg.o: $(srcdir)/src/generic/logg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/logg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_spinctrl.o: $(srcdir)/src/gtk/spinctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/spinctrl.cpp
+@COND_USE_GUI_1@monolib_numdlgg.o: $(srcdir)/src/generic/numdlgg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/numdlgg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_spinctrl.o: $(srcdir)/src/gtk1/spinctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/spinctrl.cpp
+@COND_USE_GUI_1@monolib_panelg.o: $(srcdir)/src/generic/panelg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/panelg.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp
+@COND_USE_GUI_1@monolib_progdlgg.o: $(srcdir)/src/generic/progdlgg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/progdlgg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp
+@COND_USE_GUI_1@monolib_printps.o: $(srcdir)/src/generic/printps.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/printps.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/spinctrl.cpp
+@COND_USE_GUI_1@monolib_renderg.o: $(srcdir)/src/generic/renderg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/renderg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_statbmp.o: $(srcdir)/src/gtk/statbmp.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/statbmp.cpp
+@COND_USE_GUI_1@monolib_scrlwing.o: $(srcdir)/src/generic/scrlwing.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/scrlwing.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_statbmp.o: $(srcdir)/src/gtk1/statbmp.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/statbmp.cpp
+@COND_USE_GUI_1@monolib_selstore.o: $(srcdir)/src/generic/selstore.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/selstore.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_statbmp.o: $(srcdir)/src/motif/statbmp.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/statbmp.cpp
+@COND_USE_GUI_1@monolib_spinctlg.o: $(srcdir)/src/generic/spinctlg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/spinctlg.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statbmp.cpp
+@COND_USE_GUI_1@monolib_splitter.o: $(srcdir)/src/generic/splitter.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/splitter.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statbmp.cpp
+@COND_USE_GUI_1@monolib_srchctlg.o: $(srcdir)/src/generic/srchctlg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/srchctlg.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_statbmp.o: $(srcdir)/src/osx/carbon/statbmp.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statbmp.cpp
+@COND_USE_GUI_1@monolib_statbmpg.o: $(srcdir)/src/generic/statbmpg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statbmpg.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_statbmp.o: $(srcdir)/src/cocoa/statbmp.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/statbmp.mm
+@COND_USE_GUI_1@monolib_textdlgg.o: $(srcdir)/src/generic/textdlgg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/textdlgg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_statbmp.o: $(srcdir)/src/os2/statbmp.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/statbmp.cpp
+@COND_USE_GUI_1@monolib_tipwin.o: $(srcdir)/src/generic/tipwin.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/tipwin.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_statbmp.o: $(srcdir)/src/univ/statbmp.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/statbmp.cpp
+@COND_USE_GUI_1@monolib_toolbkg.o: $(srcdir)/src/generic/toolbkg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/toolbkg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_statbox.o: $(srcdir)/src/gtk/statbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/statbox.cpp
+@COND_USE_GUI_1@monolib_treectlg.o: $(srcdir)/src/generic/treectlg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/treectlg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_statbox.o: $(srcdir)/src/gtk1/statbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/statbox.cpp
+@COND_USE_GUI_1@monolib_treebkg.o: $(srcdir)/src/generic/treebkg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/treebkg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_statbox.o: $(srcdir)/src/motif/statbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/statbox.cpp
+@COND_USE_GUI_1@monolib_vlbox.o: $(srcdir)/src/generic/vlbox.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/vlbox.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_statbox.o: $(srcdir)/src/msw/statbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
+@COND_USE_GUI_1@monolib_vscroll.o: $(srcdir)/src/generic/vscroll.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/vscroll.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_statbox.o: $(srcdir)/src/msw/statbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
+@COND_USE_GUI_1@monolib_animatecmn.o: $(srcdir)/src/common/animatecmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/animatecmn.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_statbox.o: $(srcdir)/src/osx/carbon/statbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statbox.cpp
+@COND_USE_GUI_1@monolib_bmpcboxcmn.o: $(srcdir)/src/common/bmpcboxcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/bmpcboxcmn.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_statbox.o: $(srcdir)/src/osx/cocoa/statbox.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/statbox.mm
+@COND_USE_GUI_1@monolib_calctrlcmn.o: $(srcdir)/src/common/calctrlcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/calctrlcmn.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_statbox.o: $(srcdir)/src/cocoa/statbox.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/statbox.mm
+@COND_USE_GUI_1@monolib_datavcmn.o: $(srcdir)/src/common/datavcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/datavcmn.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_statbox.o: $(srcdir)/src/os2/statbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/statbox.cpp
+@COND_USE_GUI_1@monolib_hyperlnkcmn.o: $(srcdir)/src/common/hyperlnkcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/hyperlnkcmn.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_statbox.o: $(srcdir)/src/univ/statbox.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/statbox.cpp
+@COND_USE_GUI_1@monolib_aboutdlgg.o: $(srcdir)/src/generic/aboutdlgg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/aboutdlgg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_statline.o: $(srcdir)/src/gtk/statline.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/statline.cpp
+@COND_USE_GUI_1@monolib_bmpcboxg.o: $(srcdir)/src/generic/bmpcboxg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/bmpcboxg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_statline.o: $(srcdir)/src/gtk1/statline.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/statline.cpp
+@COND_USE_GUI_1@monolib_calctrlg.o: $(srcdir)/src/generic/calctrlg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/calctrlg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_statline.o: $(srcdir)/src/generic/statline.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statline.cpp
+@COND_USE_GUI_1@monolib_datavgen.o: $(srcdir)/src/generic/datavgen.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/datavgen.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_statline.o: $(srcdir)/src/msw/statline.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statline.cpp
+@COND_USE_GUI_1@monolib_datectlg.o: $(srcdir)/src/generic/datectlg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/datectlg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_statline.o: $(srcdir)/src/msw/statline.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statline.cpp
+@COND_USE_GUI_1@monolib_editlbox.o: $(srcdir)/src/generic/editlbox.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/editlbox.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_statline.o: $(srcdir)/src/osx/cocoa/statline.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/statline.mm
+@COND_USE_GUI_1@monolib_grid.o: $(srcdir)/src/generic/grid.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/grid.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_statline.o: $(srcdir)/src/os2/statline.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/statline.cpp
+@COND_USE_GUI_1@monolib_gridctrl.o: $(srcdir)/src/generic/gridctrl.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/gridctrl.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_statline.o: $(srcdir)/src/univ/statline.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/statline.cpp
+@COND_USE_GUI_1@monolib_gridsel.o: $(srcdir)/src/generic/gridsel.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/gridsel.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_stattext.o: $(srcdir)/src/gtk/stattext.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/stattext.cpp
+@COND_USE_GUI_1@monolib_helpext.o: $(srcdir)/src/generic/helpext.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/helpext.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_stattext.o: $(srcdir)/src/gtk1/stattext.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/stattext.cpp
+@COND_USE_GUI_1@monolib_hyperlinkg.o: $(srcdir)/src/generic/hyperlinkg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/hyperlinkg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_stattext.o: $(srcdir)/src/motif/stattext.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/stattext.cpp
+@COND_USE_GUI_1@monolib_laywin.o: $(srcdir)/src/generic/laywin.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/laywin.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_stattext.o: $(srcdir)/src/msw/stattext.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
+@COND_USE_GUI_1@monolib_notifmsgg.o: $(srcdir)/src/generic/notifmsgg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/notifmsgg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_stattext.o: $(srcdir)/src/msw/stattext.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_stattext.o: $(srcdir)/src/osx/carbon/stattext.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/stattext.cpp
+@COND_USE_GUI_1@monolib_odcombo.o: $(srcdir)/src/generic/odcombo.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/odcombo.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_stattext.o: $(srcdir)/src/osx/cocoa/stattext.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/stattext.mm
+@COND_USE_GUI_1@monolib_propdlg.o: $(srcdir)/src/generic/propdlg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/propdlg.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_stattext.o: $(srcdir)/src/cocoa/stattext.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/stattext.mm
+@COND_USE_GUI_1@monolib_sashwin.o: $(srcdir)/src/generic/sashwin.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/sashwin.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_stattext.o: $(srcdir)/src/os2/stattext.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/stattext.cpp
+@COND_USE_GUI_1@monolib_splash.o: $(srcdir)/src/generic/splash.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/splash.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_stattext.o: $(srcdir)/src/univ/stattext.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/stattext.cpp
+@COND_USE_GUI_1@monolib_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/tipdlg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/tbargtk.cpp
+@COND_USE_GUI_1@monolib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/wizard.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_tbargtk.o: $(srcdir)/src/gtk1/tbargtk.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/tbargtk.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/textctrl.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_textctrl.o: $(srcdir)/src/gtk1/textctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/textctrl.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_textctrl.o: $(srcdir)/src/motif/textctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/textctrl.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/textctrl.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/textctrl.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_textctrl.o: $(srcdir)/src/osx/carbon/textctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/textctrl.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_textctrl.o: $(srcdir)/src/osx/cocoa/textctrl.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/textctrl.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_textctrl.o: $(srcdir)/src/cocoa/textctrl.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/textctrl.mm
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_textctrl.o: $(srcdir)/src/os2/textctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/textctrl.cpp
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_textctrl.o: $(srcdir)/src/univ/textctrl.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/textctrl.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_textentry.o: $(srcdir)/src/gtk/textentry.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/textentry.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_textentry.o: $(srcdir)/src/motif/textentry.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/textentry.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_textentry.o: $(srcdir)/src/msw/textentry.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_textentry.o: $(srcdir)/src/msw/textentry.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_textentry.o: $(srcdir)/src/os2/textentry.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/textentry.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_tglbtn.o: $(srcdir)/src/gtk/tglbtn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/tglbtn.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_tglbtn.o: $(srcdir)/src/gtk1/tglbtn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/tglbtn.cpp
+@COND_TOOLKIT_PM_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/tglbtn.cpp
+@COND_USE_GUI_1_WXUNIV_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/tglbtn.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_tglbtn.o: $(srcdir)/src/osx/carbon/tglbtn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/tglbtn.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_tglbtn.o: $(srcdir)/src/osx/cocoa/tglbtn.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/tglbtn.mm
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_tglbtn.o: $(srcdir)/src/os2/tglbtn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/tglbtn.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_tglbtn.o: $(srcdir)/src/univ/tglbtn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/tglbtn.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_sound.o: $(srcdir)/src/msw/sound.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/sound.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_sound.o: $(srcdir)/src/msw/sound.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/sound.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/taskbar.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/taskbar.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_joystick.o: $(srcdir)/src/msw/joystick.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/joystick.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_carbon_aboutdlg.o: $(srcdir)/src/osx/carbon/aboutdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/aboutdlg.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_carbon_drawer.o: $(srcdir)/src/osx/carbon/drawer.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/drawer.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_carbon_dataview.o: $(srcdir)/src/osx/carbon/dataview.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dataview.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_databrow.o: $(srcdir)/src/osx/carbon/databrow.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/databrow.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_carbon_sound.o: $(srcdir)/src/osx/carbon/sound.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/sound.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_carbon_taskbar.o: $(srcdir)/src/osx/carbon/taskbar.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/taskbar.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_cocoa_aboutdlg.o: $(srcdir)/src/osx/cocoa/aboutdlg.mm $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/aboutdlg.mm
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_osx_cocoa_taskbar.o: $(srcdir)/src/osx/cocoa/taskbar.mm $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/taskbar.mm
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_src_cocoa_taskbar.o: $(srcdir)/src/cocoa/taskbar.mm $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/taskbar.mm
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monolib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monolib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_taskbar.o: $(srcdir)/src/gtk/taskbar.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/taskbar.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/gtk/eggtrayicon.c
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_hildon_notifmsg.o: $(srcdir)/src/gtk/hildon/notifmsg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/hildon/notifmsg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_eggtrayicon.o: $(srcdir)/src/gtk1/eggtrayicon.c $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/gtk1/eggtrayicon.c
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_taskbar.o: $(srcdir)/src/gtk1/taskbar.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/taskbar.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_TOOLKIT_PM_USE_GUI_1@monolib_os2_joystick.o: $(srcdir)/src/os2/joystick.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/joystick.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_TOOLKIT_PM_USE_GUI_1@monolib_os2_sound.o: $(srcdir)/src/os2/sound.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/sound.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_bmpcbox.o: $(srcdir)/src/msw/bmpcbox.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/bmpcbox.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_bmpcbox.o: $(srcdir)/src/msw/bmpcbox.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/bmpcbox.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/menuitem.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_menuitem.o: $(srcdir)/src/msw/menuitem.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/menuitem.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_menuitem.o: $(srcdir)/src/msw/menuitem.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/menuitem.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/datecontrols.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_menuitem.o: $(srcdir)/src/osx/carbon/menuitem.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/menuitem.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/datecontrols.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_menuitem.o: $(srcdir)/src/osx/cocoa/menuitem.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/menuitem.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_menuitem.o: $(srcdir)/src/cocoa/menuitem.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/menuitem.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_menuitem.o: $(srcdir)/src/os2/menuitem.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/menuitem.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_mediactrl_am.o: $(srcdir)/src/msw/mediactrl_am.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_am.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_toolbar.o: $(srcdir)/src/motif/toolbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/toolbar.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_mediactrl_am.o: $(srcdir)/src/msw/mediactrl_am.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_am.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_mediactrl_wmp10.o: $(srcdir)/src/msw/mediactrl_wmp10.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_wmp10.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_mediactrl_wmp10.o: $(srcdir)/src/msw/mediactrl_wmp10.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_wmp10.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_toolbar.o: $(srcdir)/src/osx/carbon/toolbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/toolbar.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_mediactrl_qt.o: $(srcdir)/src/msw/mediactrl_qt.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_qt.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_toolbar.o: $(srcdir)/src/osx/cocoa/toolbar.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/toolbar.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_mediactrl_qt.o: $(srcdir)/src/msw/mediactrl_qt.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_qt.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_toolbar.o: $(srcdir)/src/cocoa/toolbar.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/toolbar.mm
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_toolbar.o: $(srcdir)/src/os2/toolbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/toolbar.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_toolbar.o: $(srcdir)/src/univ/toolbar.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/toolbar.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_combo.o: $(srcdir)/src/msw/combo.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/combo.cpp
+@COND_TOOLKIT_GTK_USE_GUI_1@monolib_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_combo.o: $(srcdir)/src/msw/combo.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/combo.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
+@COND_PLATFORM_UNIX_1_USE_GUI_1@monolib_chm.o: $(srcdir)/src/html/chm.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@monolib_chm.o: $(srcdir)/src/html/chm.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
+basedll_version_rc.o: $(srcdir)/src/msw/version.rc $(BASEDLL_ODEP)
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXMAKINGDLL_BASE --define wxUSE_BASE=1
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
+basedll_appbase.o: $(srcdir)/src/common/appbase.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/appbase.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_iniconf.o: $(srcdir)/src/os2/iniconf.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/iniconf.cpp
+basedll_arcall.o: $(srcdir)/src/common/arcall.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/arcall.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_metafile.o: $(srcdir)/src/msw/metafile.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/metafile.cpp
+basedll_arcfind.o: $(srcdir)/src/common/arcfind.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/arcfind.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_metafile.o: $(srcdir)/src/msw/metafile.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/metafile.cpp
+basedll_archive.o: $(srcdir)/src/common/archive.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/archive.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
+basedll_arrstr.o: $(srcdir)/src/common/arrstr.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/arrstr.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
+basedll_base64.o: $(srcdir)/src/common/base64.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/base64.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_metafile.o: $(srcdir)/src/os2/metafile.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/metafile.cpp
+basedll_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/clntdata.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp
+basedll_cmdline.o: $(srcdir)/src/common/cmdline.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/cmdline.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp
+basedll_config.o: $(srcdir)/src/common/config.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/config.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_nativdlg.o: $(srcdir)/src/os2/nativdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/nativdlg.cpp
+basedll_convauto.o: $(srcdir)/src/common/convauto.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/convauto.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_access.o: $(srcdir)/src/msw/ole/access.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp
+basedll_datetime.o: $(srcdir)/src/common/datetime.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/datetime.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_access.o: $(srcdir)/src/msw/ole/access.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp
+basedll_datstrm.o: $(srcdir)/src/common/datstrm.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/datstrm.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp
+basedll_dircmn.o: $(srcdir)/src/common/dircmn.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/dircmn.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp
+basedll_dynarray.o: $(srcdir)/src/common/dynarray.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/dynarray.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/ownerdrw.cpp
+basedll_dynlib.o: $(srcdir)/src/common/dynlib.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/dynlib.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
+basedll_dynload.o: $(srcdir)/src/common/dynload.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/dynload.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
+basedll_encconv.o: $(srcdir)/src/common/encconv.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/encconv.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/tabctrl.cpp
+basedll_evtloopcmn.o: $(srcdir)/src/common/evtloopcmn.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/evtloopcmn.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/tabctrl.cpp
+basedll_extended.o: $(srcdir)/src/common/extended.c $(BASEDLL_ODEP)
+ $(CCC) -c -o $@ $(BASEDLL_CFLAGS) $(srcdir)/src/common/extended.c
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_tabctrl.o: $(srcdir)/src/osx/carbon/tabctrl.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/tabctrl.cpp
+basedll_ffile.o: $(srcdir)/src/common/ffile.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/ffile.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_tabctrl.o: $(srcdir)/src/osx/carbon/tabctrl.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/tabctrl.cpp
+basedll_file.o: $(srcdir)/src/common/file.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/file.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_tabctrl.o: $(srcdir)/src/os2/tabctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/tabctrl.cpp
+basedll_fileback.o: $(srcdir)/src/common/fileback.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fileback.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp
+basedll_fileconf.o: $(srcdir)/src/common/fileconf.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fileconf.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp
+basedll_filefn.o: $(srcdir)/src/common/filefn.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/filefn.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
+basedll_filename.o: $(srcdir)/src/common/filename.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/filename.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
+basedll_filesys.o: $(srcdir)/src/common/filesys.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/filesys.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
+basedll_filtall.o: $(srcdir)/src/common/filtall.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/filtall.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
+basedll_filtfind.o: $(srcdir)/src/common/filtfind.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/filtfind.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_glgrab.o: $(srcdir)/src/osx/core/glgrab.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/glgrab.cpp
+basedll_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fmapbase.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_glgrab.o: $(srcdir)/src/osx/core/glgrab.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/glgrab.cpp
+basedll_fs_arc.o: $(srcdir)/src/common/fs_arc.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fs_arc.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
+basedll_fs_filter.o: $(srcdir)/src/common/fs_filter.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fs_filter.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
+basedll_hash.o: $(srcdir)/src/common/hash.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/hash.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
+basedll_hashmap.o: $(srcdir)/src/common/hashmap.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/hashmap.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
+basedll_init.o: $(srcdir)/src/common/init.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/init.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_srchctrl.o: $(srcdir)/src/osx/carbon/srchctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/srchctrl.cpp
+basedll_intl.o: $(srcdir)/src/common/intl.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/intl.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_srchctrl.o: $(srcdir)/src/osx/cocoa/srchctrl.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/srchctrl.mm
+basedll_ipcbase.o: $(srcdir)/src/common/ipcbase.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/ipcbase.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_regiong.o: $(srcdir)/src/generic/regiong.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp
+basedll_list.o: $(srcdir)/src/common/list.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/list.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_regiong.o: $(srcdir)/src/generic/regiong.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp
+basedll_log.o: $(srcdir)/src/common/log.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/log.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_drawer.o: $(srcdir)/src/cocoa/drawer.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/drawer.mm
+basedll_longlong.o: $(srcdir)/src/common/longlong.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/longlong.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_drawer.o: $(srcdir)/src/osx/carbon/drawer.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/drawer.cpp
+basedll_memory.o: $(srcdir)/src/common/memory.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/memory.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_sound.o: $(srcdir)/src/cocoa/sound.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/sound.mm
+basedll_mimecmn.o: $(srcdir)/src/common/mimecmn.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/mimecmn.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_sound.o: $(srcdir)/src/msw/sound.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/sound.cpp
+basedll_module.o: $(srcdir)/src/common/module.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/module.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_sound.o: $(srcdir)/src/msw/sound.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/sound.cpp
+basedll_mstream.o: $(srcdir)/src/common/mstream.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/mstream.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_sound.o: $(srcdir)/src/osx/carbon/sound.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/sound.cpp
+basedll_object.o: $(srcdir)/src/common/object.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/object.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+basedll_platinfo.o: $(srcdir)/src/common/platinfo.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/platinfo.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+basedll_powercmn.o: $(srcdir)/src/common/powercmn.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/powercmn.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+basedll_process.o: $(srcdir)/src/common/process.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/process.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+basedll_regex.o: $(srcdir)/src/common/regex.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/regex.cpp
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monolib_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+basedll_stdpbase.o: $(srcdir)/src/common/stdpbase.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/stdpbase.cpp
-@COND_TOOLKIT_PM_USE_GUI_1@monolib_sound.o: $(srcdir)/src/os2/sound.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/sound.cpp
+basedll_sstream.o: $(srcdir)/src/common/sstream.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/sstream.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
+basedll_stopwatch.o: $(srcdir)/src/common/stopwatch.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/stopwatch.cpp
-@COND_USE_GUI_1_WXUNIV_1@monolib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
+basedll_strconv.o: $(srcdir)/src/common/strconv.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/strconv.cpp
-@COND_USE_GUI_1@monolib_accelcmn.o: $(srcdir)/src/common/accelcmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/accelcmn.cpp
+basedll_stream.o: $(srcdir)/src/common/stream.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/stream.cpp
-@COND_USE_GUI_1@monolib_accesscmn.o: $(srcdir)/src/common/accesscmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/accesscmn.cpp
+basedll_string.o: $(srcdir)/src/common/string.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/string.cpp
-@COND_USE_GUI_1@monolib_anidecod.o: $(srcdir)/src/common/anidecod.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/anidecod.cpp
+basedll_stringimpl.o: $(srcdir)/src/common/stringimpl.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/stringimpl.cpp
-@COND_USE_GUI_1@monolib_appcmn.o: $(srcdir)/src/common/appcmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/appcmn.cpp
+basedll_stringops.o: $(srcdir)/src/common/stringops.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/stringops.cpp
-@COND_USE_GUI_1@monolib_artprov.o: $(srcdir)/src/common/artprov.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/artprov.cpp
+basedll_strvararg.o: $(srcdir)/src/common/strvararg.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/strvararg.cpp
-@COND_USE_GUI_1@monolib_artstd.o: $(srcdir)/src/common/artstd.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/artstd.cpp
+basedll_sysopt.o: $(srcdir)/src/common/sysopt.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/sysopt.cpp
-@COND_USE_GUI_1@monolib_bmpbase.o: $(srcdir)/src/common/bmpbase.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/bmpbase.cpp
+basedll_tarstrm.o: $(srcdir)/src/common/tarstrm.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/tarstrm.cpp
-@COND_USE_GUI_1@monolib_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/bookctrl.cpp
+basedll_textbuf.o: $(srcdir)/src/common/textbuf.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/textbuf.cpp
-@COND_USE_GUI_1@monolib_btncmn.o: $(srcdir)/src/common/btncmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/btncmn.cpp
+basedll_textfile.o: $(srcdir)/src/common/textfile.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/textfile.cpp
-@COND_USE_GUI_1@monolib_cairo.o: $(srcdir)/src/common/cairo.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/cairo.cpp
+basedll_timercmn.o: $(srcdir)/src/common/timercmn.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/timercmn.cpp
-@COND_USE_GUI_1@monolib_choiccmn.o: $(srcdir)/src/common/choiccmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/choiccmn.cpp
+basedll_timerimpl.o: $(srcdir)/src/common/timerimpl.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/timerimpl.cpp
-@COND_USE_GUI_1@monolib_clipcmn.o: $(srcdir)/src/common/clipcmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/clipcmn.cpp
+basedll_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/tokenzr.cpp
-@COND_USE_GUI_1@monolib_clrpickercmn.o: $(srcdir)/src/common/clrpickercmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/clrpickercmn.cpp
+basedll_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/txtstrm.cpp
-@COND_USE_GUI_1@monolib_colourcmn.o: $(srcdir)/src/common/colourcmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/colourcmn.cpp
+basedll_unichar.o: $(srcdir)/src/common/unichar.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/unichar.cpp
-@COND_USE_GUI_1@monolib_combocmn.o: $(srcdir)/src/common/combocmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/combocmn.cpp
+basedll_uri.o: $(srcdir)/src/common/uri.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/uri.cpp
-@COND_USE_GUI_1@monolib_cmdproc.o: $(srcdir)/src/common/cmdproc.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/cmdproc.cpp
+basedll_ustring.o: $(srcdir)/src/common/ustring.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/ustring.cpp
-@COND_USE_GUI_1@monolib_cmndata.o: $(srcdir)/src/common/cmndata.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/cmndata.cpp
+basedll_variant.o: $(srcdir)/src/common/variant.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/variant.cpp
-@COND_USE_GUI_1@monolib_containr.o: $(srcdir)/src/common/containr.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/containr.cpp
+basedll_wfstream.o: $(srcdir)/src/common/wfstream.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/wfstream.cpp
-@COND_USE_GUI_1@monolib_cshelp.o: $(srcdir)/src/common/cshelp.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/cshelp.cpp
+basedll_wxcrt.o: $(srcdir)/src/common/wxcrt.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/wxcrt.cpp
-@COND_USE_GUI_1@monolib_ctrlcmn.o: $(srcdir)/src/common/ctrlcmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/ctrlcmn.cpp
+basedll_wxprintf.o: $(srcdir)/src/common/wxprintf.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/wxprintf.cpp
-@COND_USE_GUI_1@monolib_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/ctrlsub.cpp
+basedll_xlocale.o: $(srcdir)/src/common/xlocale.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/xlocale.cpp
-@COND_USE_GUI_1@monolib_datacmn.o: $(srcdir)/src/common/datacmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/datacmn.cpp
+basedll_xti.o: $(srcdir)/src/common/xti.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/xti.cpp
-@COND_USE_GUI_1@monolib_dcbase.o: $(srcdir)/src/common/dcbase.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dcbase.cpp
+basedll_xtistrm.o: $(srcdir)/src/common/xtistrm.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/xtistrm.cpp
-@COND_USE_GUI_1@monolib_dcbufcmn.o: $(srcdir)/src/common/dcbufcmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dcbufcmn.cpp
+basedll_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/zipstrm.cpp
-@COND_USE_GUI_1@monolib_dcgraph.o: $(srcdir)/src/common/dcgraph.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dcgraph.cpp
+basedll_zstream.o: $(srcdir)/src/common/zstream.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/zstream.cpp
-@COND_USE_GUI_1@monolib_dcsvg.o: $(srcdir)/src/common/dcsvg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dcsvg.cpp
+basedll_unix_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp
-@COND_USE_GUI_1@monolib_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dlgcmn.cpp
+basedll_basemsw.o: $(srcdir)/src/msw/basemsw.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/basemsw.cpp
-@COND_USE_GUI_1@monolib_dndcmn.o: $(srcdir)/src/common/dndcmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dndcmn.cpp
+basedll_crashrpt.o: $(srcdir)/src/msw/crashrpt.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/crashrpt.cpp
-@COND_USE_GUI_1@monolib_dobjcmn.o: $(srcdir)/src/common/dobjcmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dobjcmn.cpp
+basedll_debughlp.o: $(srcdir)/src/msw/debughlp.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/debughlp.cpp
-@COND_USE_GUI_1@monolib_docmdi.o: $(srcdir)/src/common/docmdi.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/docmdi.cpp
+basedll_dde.o: $(srcdir)/src/msw/dde.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/dde.cpp
-@COND_USE_GUI_1@monolib_docview.o: $(srcdir)/src/common/docview.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/docview.cpp
+basedll_msw_dir.o: $(srcdir)/src/msw/dir.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/dir.cpp
-@COND_USE_GUI_1@monolib_dpycmn.o: $(srcdir)/src/common/dpycmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dpycmn.cpp
+basedll_dlmsw.o: $(srcdir)/src/msw/dlmsw.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/dlmsw.cpp
-@COND_USE_GUI_1@monolib_dseldlg.o: $(srcdir)/src/common/dseldlg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dseldlg.cpp
+basedll_msw_mimetype.o: $(srcdir)/src/msw/mimetype.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/mimetype.cpp
-@COND_USE_GUI_1@monolib_effects.o: $(srcdir)/src/common/effects.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/effects.cpp
+basedll_power.o: $(srcdir)/src/msw/power.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/power.cpp
-@COND_USE_GUI_1@monolib_fddlgcmn.o: $(srcdir)/src/common/fddlgcmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fddlgcmn.cpp
+basedll_regconf.o: $(srcdir)/src/msw/regconf.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/regconf.cpp
-@COND_USE_GUI_1@monolib_filectrlcmn.o: $(srcdir)/src/common/filectrlcmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/filectrlcmn.cpp
+basedll_registry.o: $(srcdir)/src/msw/registry.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/registry.cpp
-@COND_USE_GUI_1@monolib_filepickercmn.o: $(srcdir)/src/common/filepickercmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/filepickercmn.cpp
+basedll_msw_snglinst.o: $(srcdir)/src/msw/snglinst.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/snglinst.cpp
-@COND_USE_GUI_1@monolib_fontpickercmn.o: $(srcdir)/src/common/fontpickercmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontpickercmn.cpp
+basedll_msw_stackwalk.o: $(srcdir)/src/msw/stackwalk.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/stackwalk.cpp
-@COND_USE_GUI_1@monolib_fldlgcmn.o: $(srcdir)/src/common/fldlgcmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fldlgcmn.cpp
+basedll_msw_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/stdpaths.cpp
-@COND_USE_GUI_1@monolib_fontcmn.o: $(srcdir)/src/common/fontcmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontcmn.cpp
+basedll_msw_thread.o: $(srcdir)/src/msw/thread.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/thread.cpp
-@COND_USE_GUI_1@monolib_fontenumcmn.o: $(srcdir)/src/common/fontenumcmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontenumcmn.cpp
+basedll_timer.o: $(srcdir)/src/msw/timer.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/timer.cpp
-@COND_USE_GUI_1@monolib_fontmap.o: $(srcdir)/src/common/fontmap.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontmap.cpp
+basedll_msw_utils.o: $(srcdir)/src/msw/utils.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/utils.cpp
-@COND_USE_GUI_1@monolib_fontutilcmn.o: $(srcdir)/src/common/fontutilcmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontutilcmn.cpp
+basedll_msw_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/utilsexc.cpp
-@COND_USE_GUI_1@monolib_framecmn.o: $(srcdir)/src/common/framecmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/framecmn.cpp
+basedll_time.o: $(srcdir)/src/msw/wince/time.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/wince/time.cpp
-@COND_USE_GUI_1@monolib_gaugecmn.o: $(srcdir)/src/common/gaugecmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/gaugecmn.cpp
+basedll_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/core/mimetype.cpp
-@COND_USE_GUI_1@monolib_gbsizer.o: $(srcdir)/src/common/gbsizer.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/gbsizer.cpp
+basedll_cfstring.o: $(srcdir)/src/osx/core/cfstring.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/core/cfstring.cpp
-@COND_USE_GUI_1@monolib_gdicmn.o: $(srcdir)/src/common/gdicmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/gdicmn.cpp
+basedll_gsockosx.o: $(srcdir)/src/osx/core/gsockosx.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/core/gsockosx.cpp
-@COND_USE_GUI_1@monolib_geometry.o: $(srcdir)/src/common/geometry.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/geometry.cpp
+basedll_stdpaths_cf.o: $(srcdir)/src/osx/core/stdpaths_cf.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/core/stdpaths_cf.cpp
-@COND_USE_GUI_1@monolib_gifdecod.o: $(srcdir)/src/common/gifdecod.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/gifdecod.cpp
+basedll_strconv_cf.o: $(srcdir)/src/osx/core/strconv_cf.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/core/strconv_cf.cpp
-@COND_USE_GUI_1@monolib_graphcmn.o: $(srcdir)/src/common/graphcmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/graphcmn.cpp
+basedll_utilsexc_base.o: $(srcdir)/src/osx/core/utilsexc_base.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_base.cpp
-@COND_USE_GUI_1@monolib_helpbase.o: $(srcdir)/src/common/helpbase.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/helpbase.cpp
+basedll_os2_dir.o: $(srcdir)/src/os2/dir.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/dir.cpp
-@COND_USE_GUI_1@monolib_iconbndl.o: $(srcdir)/src/common/iconbndl.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/iconbndl.cpp
+basedll_os2_mimetype.o: $(srcdir)/src/os2/mimetype.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/mimetype.cpp
-@COND_USE_GUI_1@monolib_imagall.o: $(srcdir)/src/common/imagall.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/imagall.cpp
+basedll_os2_stdpaths.o: $(srcdir)/src/os2/stdpaths.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/stdpaths.cpp
-@COND_USE_GUI_1@monolib_imagbmp.o: $(srcdir)/src/common/imagbmp.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/imagbmp.cpp
+basedll_os2_thread.o: $(srcdir)/src/os2/thread.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/thread.cpp
-@COND_USE_GUI_1@monolib_image.o: $(srcdir)/src/common/image.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/image.cpp
+basedll_os2_utils.o: $(srcdir)/src/os2/utils.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/utils.cpp
-@COND_USE_GUI_1@monolib_imagfill.o: $(srcdir)/src/common/imagfill.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/imagfill.cpp
+basedll_os2_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/utilsexc.cpp
-@COND_USE_GUI_1@monolib_imaggif.o: $(srcdir)/src/common/imaggif.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/imaggif.cpp
+basedll_msdos_dir.o: $(srcdir)/src/msdos/dir.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msdos/dir.cpp
-@COND_USE_GUI_1@monolib_imagiff.o: $(srcdir)/src/common/imagiff.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/imagiff.cpp
+basedll_msdos_mimetype.o: $(srcdir)/src/msdos/mimetype.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msdos/mimetype.cpp
-@COND_USE_GUI_1@monolib_imagjpeg.o: $(srcdir)/src/common/imagjpeg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/imagjpeg.cpp
+basedll_utilsdos.o: $(srcdir)/src/msdos/utilsdos.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msdos/utilsdos.cpp
-@COND_USE_GUI_1@monolib_imagpcx.o: $(srcdir)/src/common/imagpcx.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/imagpcx.cpp
+basedll_event.o: $(srcdir)/src/common/event.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/event.cpp
-@COND_USE_GUI_1@monolib_imagpng.o: $(srcdir)/src/common/imagpng.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/imagpng.cpp
+basedll_fs_mem.o: $(srcdir)/src/common/fs_mem.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fs_mem.cpp
-@COND_USE_GUI_1@monolib_imagpnm.o: $(srcdir)/src/common/imagpnm.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/imagpnm.cpp
+basedll_msgout.o: $(srcdir)/src/common/msgout.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/msgout.cpp
-@COND_USE_GUI_1@monolib_imagtga.o: $(srcdir)/src/common/imagtga.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/imagtga.cpp
+basedll_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/utilscmn.cpp
-@COND_USE_GUI_1@monolib_imagtiff.o: $(srcdir)/src/common/imagtiff.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/imagtiff.cpp
+basedll_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp
-@COND_USE_GUI_1@monolib_imagxpm.o: $(srcdir)/src/common/imagxpm.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/imagxpm.cpp
+basedll_main.o: $(srcdir)/src/msw/main.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/main.cpp
-@COND_USE_GUI_1@monolib_layout.o: $(srcdir)/src/common/layout.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/layout.cpp
+basedll_mslu.o: $(srcdir)/src/msw/mslu.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/mslu.cpp
-@COND_USE_GUI_1@monolib_lboxcmn.o: $(srcdir)/src/common/lboxcmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/lboxcmn.cpp
+basedll_volume.o: $(srcdir)/src/msw/volume.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/volume.cpp
-@COND_USE_GUI_1@monolib_listctrlcmn.o: $(srcdir)/src/common/listctrlcmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/listctrlcmn.cpp
+basedll_carbon_utils.o: $(srcdir)/src/osx/carbon/utils.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/utils.cpp
-@COND_USE_GUI_1@monolib_matrix.o: $(srcdir)/src/common/matrix.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/matrix.cpp
+basedll_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/uma.cpp
-@COND_USE_GUI_1@monolib_menucmn.o: $(srcdir)/src/common/menucmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/menucmn.cpp
+basedll_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm
-@COND_USE_GUI_1@monolib_nbkbase.o: $(srcdir)/src/common/nbkbase.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/nbkbase.cpp
+@COND_PLATFORM_UNIX_1@basedll_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp
-@COND_USE_GUI_1@monolib_overlaycmn.o: $(srcdir)/src/common/overlaycmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/overlaycmn.cpp
+@COND_PLATFORM_MACOSX_1@basedll_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp
-@COND_USE_GUI_1@monolib_paper.o: $(srcdir)/src/common/paper.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/paper.cpp
+@COND_PLATFORM_OS2_1@basedll_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp
-@COND_USE_GUI_1@monolib_pickerbase.o: $(srcdir)/src/common/pickerbase.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/pickerbase.cpp
+@COND_PLATFORM_UNIX_1@basedll_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp
-@COND_USE_GUI_1@monolib_popupcmn.o: $(srcdir)/src/common/popupcmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/popupcmn.cpp
+@COND_PLATFORM_MACOSX_1@basedll_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp
-@COND_USE_GUI_1@monolib_prntbase.o: $(srcdir)/src/common/prntbase.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/prntbase.cpp
+@COND_PLATFORM_OS2_1@basedll_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp
-@COND_USE_GUI_1@monolib_quantize.o: $(srcdir)/src/common/quantize.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/quantize.cpp
+@COND_PLATFORM_UNIX_1@basedll_epolldispatcher.o: $(srcdir)/src/unix/epolldispatcher.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/epolldispatcher.cpp
-@COND_USE_GUI_1@monolib_radiocmn.o: $(srcdir)/src/common/radiocmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/radiocmn.cpp
+@COND_PLATFORM_MACOSX_1@basedll_epolldispatcher.o: $(srcdir)/src/unix/epolldispatcher.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/epolldispatcher.cpp
-@COND_USE_GUI_1@monolib_rendcmn.o: $(srcdir)/src/common/rendcmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/rendcmn.cpp
+@COND_PLATFORM_UNIX_1@basedll_appunix.o: $(srcdir)/src/unix/appunix.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp
-@COND_USE_GUI_1@monolib_rgncmn.o: $(srcdir)/src/common/rgncmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/rgncmn.cpp
+@COND_PLATFORM_MACOSX_1@basedll_appunix.o: $(srcdir)/src/unix/appunix.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp
-@COND_USE_GUI_1@monolib_settcmn.o: $(srcdir)/src/common/settcmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/settcmn.cpp
+@COND_PLATFORM_OS2_1@basedll_appunix.o: $(srcdir)/src/unix/appunix.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp
-@COND_USE_GUI_1@monolib_sizer.o: $(srcdir)/src/common/sizer.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/sizer.cpp
+@COND_PLATFORM_UNIX_1@basedll_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp
-@COND_USE_GUI_1@monolib_srchcmn.o: $(srcdir)/src/common/srchcmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/srchcmn.cpp
+@COND_PLATFORM_MACOSX_1@basedll_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp
-@COND_USE_GUI_1@monolib_statbar.o: $(srcdir)/src/common/statbar.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/statbar.cpp
+@COND_PLATFORM_OS2_1@basedll_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp
-@COND_USE_GUI_1@monolib_stattextcmn.o: $(srcdir)/src/common/stattextcmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/stattextcmn.cpp
+@COND_PLATFORM_UNIX_1@basedll_unix_dir.o: $(srcdir)/src/unix/dir.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/dir.cpp
-@COND_USE_GUI_1@monolib_stockitem.o: $(srcdir)/src/common/stockitem.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/stockitem.cpp
+@COND_PLATFORM_MACOSX_1@basedll_unix_dir.o: $(srcdir)/src/unix/dir.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/dir.cpp
-@COND_USE_GUI_1@monolib_tbarbase.o: $(srcdir)/src/common/tbarbase.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/tbarbase.cpp
+@COND_PLATFORM_UNIX_1@basedll_dlunix.o: $(srcdir)/src/unix/dlunix.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/dlunix.cpp
-@COND_USE_GUI_1@monolib_textcmn.o: $(srcdir)/src/common/textcmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/textcmn.cpp
+@COND_PLATFORM_MACOSX_1@basedll_dlunix.o: $(srcdir)/src/unix/dlunix.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/dlunix.cpp
-@COND_USE_GUI_1@monolib_textentrycmn.o: $(srcdir)/src/common/textentrycmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/textentrycmn.cpp
+@COND_PLATFORM_UNIX_1@basedll_unix_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
-@COND_USE_GUI_1@monolib_toplvcmn.o: $(srcdir)/src/common/toplvcmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/toplvcmn.cpp
+@COND_PLATFORM_MACOSX_1@basedll_unix_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
-@COND_USE_GUI_1@monolib_treebase.o: $(srcdir)/src/common/treebase.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/treebase.cpp
+@COND_PLATFORM_UNIX_1@basedll_unix_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/stdpaths.cpp
-@COND_USE_GUI_1@monolib_valgen.o: $(srcdir)/src/common/valgen.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/valgen.cpp
+@COND_PLATFORM_MACOSX_1@basedll_unix_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/stdpaths.cpp
-@COND_USE_GUI_1@monolib_validate.o: $(srcdir)/src/common/validate.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/validate.cpp
+@COND_PLATFORM_UNIX_1@basedll_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp
-@COND_USE_GUI_1@monolib_valtext.o: $(srcdir)/src/common/valtext.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/valtext.cpp
+@COND_PLATFORM_MACOSX_1@basedll_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp
-@COND_USE_GUI_1@monolib_wincmn.o: $(srcdir)/src/common/wincmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/wincmn.cpp
+@COND_PLATFORM_OS2_1@basedll_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp
-@COND_USE_GUI_1@monolib_windowid.o: $(srcdir)/src/common/windowid.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/windowid.cpp
+@COND_PLATFORM_UNIX_1@basedll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/threadpsx.cpp
-@COND_USE_GUI_1@monolib_wrapsizer.o: $(srcdir)/src/common/wrapsizer.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/wrapsizer.cpp
+@COND_PLATFORM_MACOSX_1@basedll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/threadpsx.cpp
-@COND_USE_GUI_1@monolib_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/xpmdecod.cpp
+@COND_PLATFORM_UNIX_1@basedll_unix_stackwalk.o: $(srcdir)/src/unix/stackwalk.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/stackwalk.cpp
-@COND_USE_GUI_1@monolib_busyinfo.o: $(srcdir)/src/generic/busyinfo.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/busyinfo.cpp
+@COND_PLATFORM_MACOSX_1@basedll_unix_stackwalk.o: $(srcdir)/src/unix/stackwalk.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/stackwalk.cpp
-@COND_USE_GUI_1@monolib_buttonbar.o: $(srcdir)/src/generic/buttonbar.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/buttonbar.cpp
+@COND_PLATFORM_UNIX_1@basedll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
-@COND_USE_GUI_1@monolib_choicdgg.o: $(srcdir)/src/generic/choicdgg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/choicdgg.cpp
+@COND_PLATFORM_MACOSX_1@basedll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
-@COND_USE_GUI_1@monolib_choicbkg.o: $(srcdir)/src/generic/choicbkg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/choicbkg.cpp
+@COND_PLATFORM_UNIX_1@basedll_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
-@COND_USE_GUI_1@monolib_combog.o: $(srcdir)/src/generic/combog.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/combog.cpp
+@COND_PLATFORM_OS2_1@basedll_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
-@COND_USE_GUI_1@monolib_dcpsg.o: $(srcdir)/src/generic/dcpsg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dcpsg.cpp
+baselib_appbase.o: $(srcdir)/src/common/appbase.cpp $(BASELIB_ODEP)
+ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/appbase.cpp
-@COND_USE_GUI_1@monolib_dirctrlg.o: $(srcdir)/src/generic/dirctrlg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dirctrlg.cpp
-
-@COND_USE_GUI_1@monolib_dragimgg.o: $(srcdir)/src/generic/dragimgg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dragimgg.cpp
-
-@COND_USE_GUI_1@monolib_filectrlg.o: $(srcdir)/src/generic/filectrlg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filectrlg.cpp
-
-@COND_USE_GUI_1@monolib_listbkg.o: $(srcdir)/src/generic/listbkg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listbkg.cpp
-
-@COND_USE_GUI_1@monolib_logg.o: $(srcdir)/src/generic/logg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/logg.cpp
-
-@COND_USE_GUI_1@monolib_numdlgg.o: $(srcdir)/src/generic/numdlgg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/numdlgg.cpp
-
-@COND_USE_GUI_1@monolib_panelg.o: $(srcdir)/src/generic/panelg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/panelg.cpp
-
-@COND_USE_GUI_1@monolib_progdlgg.o: $(srcdir)/src/generic/progdlgg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/progdlgg.cpp
-
-@COND_USE_GUI_1@monolib_printps.o: $(srcdir)/src/generic/printps.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/printps.cpp
-
-@COND_USE_GUI_1@monolib_renderg.o: $(srcdir)/src/generic/renderg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/renderg.cpp
-
-@COND_USE_GUI_1@monolib_scrlwing.o: $(srcdir)/src/generic/scrlwing.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/scrlwing.cpp
-
-@COND_USE_GUI_1@monolib_selstore.o: $(srcdir)/src/generic/selstore.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/selstore.cpp
-
-@COND_USE_GUI_1@monolib_spinctlg.o: $(srcdir)/src/generic/spinctlg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/spinctlg.cpp
-
-@COND_USE_GUI_1@monolib_splitter.o: $(srcdir)/src/generic/splitter.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/splitter.cpp
-
-@COND_USE_GUI_1@monolib_srchctlg.o: $(srcdir)/src/generic/srchctlg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/srchctlg.cpp
-
-@COND_USE_GUI_1@monolib_statbmpg.o: $(srcdir)/src/generic/statbmpg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statbmpg.cpp
-
-@COND_USE_GUI_1@monolib_textdlgg.o: $(srcdir)/src/generic/textdlgg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/textdlgg.cpp
-
-@COND_USE_GUI_1@monolib_tipwin.o: $(srcdir)/src/generic/tipwin.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/tipwin.cpp
-
-@COND_USE_GUI_1@monolib_toolbkg.o: $(srcdir)/src/generic/toolbkg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/toolbkg.cpp
-
-@COND_USE_GUI_1@monolib_treectlg.o: $(srcdir)/src/generic/treectlg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/treectlg.cpp
-
-@COND_USE_GUI_1@monolib_treebkg.o: $(srcdir)/src/generic/treebkg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/treebkg.cpp
-
-@COND_USE_GUI_1@monolib_vlbox.o: $(srcdir)/src/generic/vlbox.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/vlbox.cpp
-
-@COND_USE_GUI_1@monolib_vscroll.o: $(srcdir)/src/generic/vscroll.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/vscroll.cpp
-
-@COND_USE_GUI_1@monolib_animatecmn.o: $(srcdir)/src/common/animatecmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/animatecmn.cpp
-
-@COND_USE_GUI_1@monolib_bmpcboxcmn.o: $(srcdir)/src/common/bmpcboxcmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/bmpcboxcmn.cpp
-
-@COND_USE_GUI_1@monolib_calctrlcmn.o: $(srcdir)/src/common/calctrlcmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/calctrlcmn.cpp
-
-@COND_USE_GUI_1@monolib_datavcmn.o: $(srcdir)/src/common/datavcmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/datavcmn.cpp
-
-@COND_USE_GUI_1@monolib_hyperlnkcmn.o: $(srcdir)/src/common/hyperlnkcmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/hyperlnkcmn.cpp
-
-@COND_USE_GUI_1@monolib_aboutdlgg.o: $(srcdir)/src/generic/aboutdlgg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/aboutdlgg.cpp
-
-@COND_USE_GUI_1@monolib_bmpcboxg.o: $(srcdir)/src/generic/bmpcboxg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/bmpcboxg.cpp
-
-@COND_USE_GUI_1@monolib_calctrlg.o: $(srcdir)/src/generic/calctrlg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/calctrlg.cpp
-
-@COND_USE_GUI_1@monolib_datavgen.o: $(srcdir)/src/generic/datavgen.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/datavgen.cpp
-
-@COND_USE_GUI_1@monolib_datectlg.o: $(srcdir)/src/generic/datectlg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/datectlg.cpp
-
-@COND_USE_GUI_1@monolib_editlbox.o: $(srcdir)/src/generic/editlbox.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/editlbox.cpp
-
-@COND_USE_GUI_1@monolib_grid.o: $(srcdir)/src/generic/grid.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/grid.cpp
-
-@COND_USE_GUI_1@monolib_gridctrl.o: $(srcdir)/src/generic/gridctrl.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/gridctrl.cpp
-
-@COND_USE_GUI_1@monolib_gridsel.o: $(srcdir)/src/generic/gridsel.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/gridsel.cpp
-
-@COND_USE_GUI_1@monolib_helpext.o: $(srcdir)/src/generic/helpext.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/helpext.cpp
-
-@COND_USE_GUI_1@monolib_hyperlinkg.o: $(srcdir)/src/generic/hyperlinkg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/hyperlinkg.cpp
-
-@COND_USE_GUI_1@monolib_laywin.o: $(srcdir)/src/generic/laywin.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/laywin.cpp
-
-@COND_USE_GUI_1@monolib_notifmsgg.o: $(srcdir)/src/generic/notifmsgg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/notifmsgg.cpp
-
-@COND_USE_GUI_1@monolib_odcombo.o: $(srcdir)/src/generic/odcombo.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/odcombo.cpp
-
-@COND_USE_GUI_1@monolib_propdlg.o: $(srcdir)/src/generic/propdlg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/propdlg.cpp
-
-@COND_USE_GUI_1@monolib_sashwin.o: $(srcdir)/src/generic/sashwin.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/sashwin.cpp
-
-@COND_USE_GUI_1@monolib_splash.o: $(srcdir)/src/generic/splash.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/splash.cpp
-
-@COND_USE_GUI_1@monolib_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/tipdlg.cpp
-
-@COND_USE_GUI_1@monolib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/wizard.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-
-@COND_TOOLKIT_PM_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_aboutdlg.o: $(srcdir)/src/osx/carbon/aboutdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/aboutdlg.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_aboutdlg.o: $(srcdir)/src/osx/cocoa/aboutdlg.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/aboutdlg.mm
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_aboutdlg.o: $(srcdir)/src/gtk/aboutdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/aboutdlg.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_notifmsg.o: $(srcdir)/src/gtk/hildon/notifmsg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/hildon/notifmsg.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/taskbar.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/taskbar.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_taskbar.o: $(srcdir)/src/osx/carbon/taskbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/taskbar.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_taskbar.o: $(srcdir)/src/osx/cocoa/taskbar.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/taskbar.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_taskbar.o: $(srcdir)/src/cocoa/taskbar.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/taskbar.mm
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_taskbar.o: $(srcdir)/src/gtk/taskbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/taskbar.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_taskbar.o: $(srcdir)/src/gtk1/taskbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/taskbar.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_joystick.o: $(srcdir)/src/msw/joystick.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/joystick.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monolib_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-
-@COND_TOOLKIT_PM_USE_GUI_1@monolib_joystick.o: $(srcdir)/src/os2/joystick.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/joystick.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_dataview.o: $(srcdir)/src/osx/carbon/dataview.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dataview.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_dataview.o: $(srcdir)/src/gtk/dataview.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dataview.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_databrow.o: $(srcdir)/src/osx/carbon/databrow.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/databrow.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
-
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/gtk/eggtrayicon.c
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_eggtrayicon.o: $(srcdir)/src/gtk1/eggtrayicon.c $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/gtk1/eggtrayicon.c
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_bmpcbox.o: $(srcdir)/src/gtk/bmpcbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/bmpcbox.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_bmpcbox.o: $(srcdir)/src/msw/bmpcbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/bmpcbox.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_bmpcbox.o: $(srcdir)/src/msw/bmpcbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/bmpcbox.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_calctrl.o: $(srcdir)/src/gtk/calctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/calctrl.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/datecontrols.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/datecontrols.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_mediactrl_am.o: $(srcdir)/src/msw/mediactrl_am.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_am.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_mediactrl_am.o: $(srcdir)/src/msw/mediactrl_am.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_am.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_mediactrl_wmp10.o: $(srcdir)/src/msw/mediactrl_wmp10.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_wmp10.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_mediactrl_wmp10.o: $(srcdir)/src/msw/mediactrl_wmp10.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_wmp10.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_mediactrl_qt.o: $(srcdir)/src/msw/mediactrl_qt.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_qt.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_mediactrl_qt.o: $(srcdir)/src/msw/mediactrl_qt.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_qt.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_mediactrl.o: $(srcdir)/src/osx/carbon/mediactrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/mediactrl.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/mediactrl.mm
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
-
-@COND_TOOLKIT_GTK_USE_GUI_1@monolib_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
-
-@COND_PLATFORM_UNIX_1_USE_GUI_1@monolib_chm.o: $(srcdir)/src/html/chm.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp
-
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@monolib_chm.o: $(srcdir)/src/html/chm.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp
-
-basedll_version_rc.o: $(srcdir)/src/msw/version.rc $(BASEDLL_ODEP)
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXMAKINGDLL_BASE --define wxUSE_BASE=1
-
-basedll_appbase.o: $(srcdir)/src/common/appbase.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/appbase.cpp
-
-basedll_arcall.o: $(srcdir)/src/common/arcall.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/arcall.cpp
-
-basedll_arcfind.o: $(srcdir)/src/common/arcfind.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/arcfind.cpp
-
-basedll_archive.o: $(srcdir)/src/common/archive.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/archive.cpp
-
-basedll_arrstr.o: $(srcdir)/src/common/arrstr.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/arrstr.cpp
-
-basedll_base64.o: $(srcdir)/src/common/base64.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/base64.cpp
-
-basedll_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/clntdata.cpp
-
-basedll_cmdline.o: $(srcdir)/src/common/cmdline.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/cmdline.cpp
-
-basedll_config.o: $(srcdir)/src/common/config.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/config.cpp
-
-basedll_convauto.o: $(srcdir)/src/common/convauto.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/convauto.cpp
-
-basedll_datetime.o: $(srcdir)/src/common/datetime.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/datetime.cpp
-
-basedll_datstrm.o: $(srcdir)/src/common/datstrm.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/datstrm.cpp
-
-basedll_dircmn.o: $(srcdir)/src/common/dircmn.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/dircmn.cpp
-
-basedll_dynarray.o: $(srcdir)/src/common/dynarray.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/dynarray.cpp
-
-basedll_dynlib.o: $(srcdir)/src/common/dynlib.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/dynlib.cpp
-
-basedll_dynload.o: $(srcdir)/src/common/dynload.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/dynload.cpp
-
-basedll_encconv.o: $(srcdir)/src/common/encconv.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/encconv.cpp
-
-basedll_evtloopcmn.o: $(srcdir)/src/common/evtloopcmn.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/evtloopcmn.cpp
-
-basedll_extended.o: $(srcdir)/src/common/extended.c $(BASEDLL_ODEP)
- $(CCC) -c -o $@ $(BASEDLL_CFLAGS) $(srcdir)/src/common/extended.c
-
-basedll_ffile.o: $(srcdir)/src/common/ffile.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/ffile.cpp
-
-basedll_file.o: $(srcdir)/src/common/file.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/file.cpp
-
-basedll_fileback.o: $(srcdir)/src/common/fileback.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fileback.cpp
-
-basedll_fileconf.o: $(srcdir)/src/common/fileconf.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fileconf.cpp
-
-basedll_filefn.o: $(srcdir)/src/common/filefn.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/filefn.cpp
-
-basedll_filename.o: $(srcdir)/src/common/filename.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/filename.cpp
-
-basedll_filesys.o: $(srcdir)/src/common/filesys.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/filesys.cpp
-
-basedll_filtall.o: $(srcdir)/src/common/filtall.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/filtall.cpp
-
-basedll_filtfind.o: $(srcdir)/src/common/filtfind.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/filtfind.cpp
-
-basedll_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fmapbase.cpp
-
-basedll_fs_arc.o: $(srcdir)/src/common/fs_arc.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fs_arc.cpp
-
-basedll_fs_filter.o: $(srcdir)/src/common/fs_filter.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fs_filter.cpp
-
-basedll_hash.o: $(srcdir)/src/common/hash.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/hash.cpp
-
-basedll_hashmap.o: $(srcdir)/src/common/hashmap.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/hashmap.cpp
-
-basedll_init.o: $(srcdir)/src/common/init.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/init.cpp
-
-basedll_intl.o: $(srcdir)/src/common/intl.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/intl.cpp
-
-basedll_ipcbase.o: $(srcdir)/src/common/ipcbase.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/ipcbase.cpp
-
-basedll_list.o: $(srcdir)/src/common/list.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/list.cpp
-
-basedll_log.o: $(srcdir)/src/common/log.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/log.cpp
-
-basedll_longlong.o: $(srcdir)/src/common/longlong.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/longlong.cpp
-
-basedll_memory.o: $(srcdir)/src/common/memory.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/memory.cpp
-
-basedll_mimecmn.o: $(srcdir)/src/common/mimecmn.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/mimecmn.cpp
-
-basedll_module.o: $(srcdir)/src/common/module.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/module.cpp
-
-basedll_mstream.o: $(srcdir)/src/common/mstream.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/mstream.cpp
-
-basedll_object.o: $(srcdir)/src/common/object.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/object.cpp
-
-basedll_platinfo.o: $(srcdir)/src/common/platinfo.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/platinfo.cpp
-
-basedll_powercmn.o: $(srcdir)/src/common/powercmn.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/powercmn.cpp
-
-basedll_process.o: $(srcdir)/src/common/process.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/process.cpp
-
-basedll_regex.o: $(srcdir)/src/common/regex.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/regex.cpp
-
-basedll_stdpbase.o: $(srcdir)/src/common/stdpbase.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/stdpbase.cpp
-
-basedll_sstream.o: $(srcdir)/src/common/sstream.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/sstream.cpp
-
-basedll_stopwatch.o: $(srcdir)/src/common/stopwatch.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/stopwatch.cpp
-
-basedll_strconv.o: $(srcdir)/src/common/strconv.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/strconv.cpp
-
-basedll_stream.o: $(srcdir)/src/common/stream.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/stream.cpp
-
-basedll_string.o: $(srcdir)/src/common/string.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/string.cpp
-
-basedll_stringimpl.o: $(srcdir)/src/common/stringimpl.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/stringimpl.cpp
-
-basedll_stringops.o: $(srcdir)/src/common/stringops.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/stringops.cpp
-
-basedll_strvararg.o: $(srcdir)/src/common/strvararg.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/strvararg.cpp
-
-basedll_sysopt.o: $(srcdir)/src/common/sysopt.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/sysopt.cpp
-
-basedll_tarstrm.o: $(srcdir)/src/common/tarstrm.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/tarstrm.cpp
-
-basedll_textbuf.o: $(srcdir)/src/common/textbuf.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/textbuf.cpp
-
-basedll_textfile.o: $(srcdir)/src/common/textfile.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/textfile.cpp
-
-basedll_timercmn.o: $(srcdir)/src/common/timercmn.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/timercmn.cpp
-
-basedll_timerimpl.o: $(srcdir)/src/common/timerimpl.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/timerimpl.cpp
-
-basedll_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/tokenzr.cpp
-
-basedll_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/txtstrm.cpp
-
-basedll_unichar.o: $(srcdir)/src/common/unichar.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/unichar.cpp
-
-basedll_uri.o: $(srcdir)/src/common/uri.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/uri.cpp
-
-basedll_ustring.o: $(srcdir)/src/common/ustring.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/ustring.cpp
-
-basedll_variant.o: $(srcdir)/src/common/variant.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/variant.cpp
-
-basedll_wfstream.o: $(srcdir)/src/common/wfstream.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/wfstream.cpp
-
-basedll_wxcrt.o: $(srcdir)/src/common/wxcrt.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/wxcrt.cpp
-
-basedll_wxprintf.o: $(srcdir)/src/common/wxprintf.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/wxprintf.cpp
-
-basedll_xlocale.o: $(srcdir)/src/common/xlocale.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/xlocale.cpp
-
-basedll_xti.o: $(srcdir)/src/common/xti.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/xti.cpp
-
-basedll_xtistrm.o: $(srcdir)/src/common/xtistrm.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/xtistrm.cpp
-
-basedll_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/zipstrm.cpp
-
-basedll_zstream.o: $(srcdir)/src/common/zstream.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/zstream.cpp
-
-basedll_basemsw.o: $(srcdir)/src/msw/basemsw.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/basemsw.cpp
-
-basedll_crashrpt.o: $(srcdir)/src/msw/crashrpt.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/crashrpt.cpp
-
-basedll_debughlp.o: $(srcdir)/src/msw/debughlp.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/debughlp.cpp
-
-basedll_dde.o: $(srcdir)/src/msw/dde.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/dde.cpp
-
-basedll_dlmsw.o: $(srcdir)/src/msw/dlmsw.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/dlmsw.cpp
-
-basedll_power.o: $(srcdir)/src/msw/power.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/power.cpp
-
-basedll_regconf.o: $(srcdir)/src/msw/regconf.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/regconf.cpp
-
-basedll_registry.o: $(srcdir)/src/msw/registry.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/registry.cpp
-
-basedll_timer.o: $(srcdir)/src/msw/timer.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/timer.cpp
-
-basedll_time.o: $(srcdir)/src/msw/wince/time.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/wince/time.cpp
-
-basedll_cfstring.o: $(srcdir)/src/osx/core/cfstring.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/core/cfstring.cpp
-
-basedll_gsockosx.o: $(srcdir)/src/osx/core/gsockosx.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/core/gsockosx.cpp
-
-basedll_stdpaths_cf.o: $(srcdir)/src/osx/core/stdpaths_cf.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/core/stdpaths_cf.cpp
-
-basedll_strconv_cf.o: $(srcdir)/src/osx/core/strconv_cf.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/core/strconv_cf.cpp
-
-basedll_utilsexc_base.o: $(srcdir)/src/osx/core/utilsexc_base.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_base.cpp
-
-basedll_utilsdos.o: $(srcdir)/src/msdos/utilsdos.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msdos/utilsdos.cpp
-
-basedll_event.o: $(srcdir)/src/common/event.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/event.cpp
-
-basedll_fs_mem.o: $(srcdir)/src/common/fs_mem.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fs_mem.cpp
-
-basedll_msgout.o: $(srcdir)/src/common/msgout.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/msgout.cpp
-
-basedll_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/utilscmn.cpp
-
-basedll_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp
-
-basedll_main.o: $(srcdir)/src/msw/main.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/main.cpp
-
-basedll_mslu.o: $(srcdir)/src/msw/mslu.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/mslu.cpp
-
-basedll_volume.o: $(srcdir)/src/msw/volume.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/volume.cpp
-
-basedll_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(BASEDLL_ODEP)
- $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/uma.cpp
-
-@COND_PLATFORM_UNIX_1@basedll_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp
-
-@COND_PLATFORM_MACOSX_1@basedll_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp
-
-@COND_PLATFORM_OS2_1@basedll_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp
-
-@COND_PLATFORM_UNIX_1@basedll_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp
-
-@COND_PLATFORM_MACOSX_1@basedll_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp
-
-@COND_PLATFORM_OS2_1@basedll_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp
-
-@COND_PLATFORM_UNIX_1@basedll_epolldispatcher.o: $(srcdir)/src/unix/epolldispatcher.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/epolldispatcher.cpp
-
-@COND_PLATFORM_MACOSX_1@basedll_epolldispatcher.o: $(srcdir)/src/unix/epolldispatcher.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/epolldispatcher.cpp
-
-@COND_PLATFORM_UNIX_1@basedll_appunix.o: $(srcdir)/src/unix/appunix.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp
-
-@COND_PLATFORM_MACOSX_1@basedll_appunix.o: $(srcdir)/src/unix/appunix.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp
-
-@COND_PLATFORM_OS2_1@basedll_appunix.o: $(srcdir)/src/unix/appunix.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp
-
-@COND_PLATFORM_UNIX_1@basedll_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp
-
-@COND_PLATFORM_MACOSX_1@basedll_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp
-
-@COND_PLATFORM_OS2_1@basedll_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp
-
-@COND_PLATFORM_UNIX_1@basedll_dir.o: $(srcdir)/src/unix/dir.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/dir.cpp
-
-@COND_PLATFORM_MACOSX_1@basedll_dir.o: $(srcdir)/src/unix/dir.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/dir.cpp
-
-@COND_PLATFORM_WIN32_1@basedll_dir.o: $(srcdir)/src/msw/dir.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/dir.cpp
-
-@COND_PLATFORM_OS2_1@basedll_dir.o: $(srcdir)/src/os2/dir.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/dir.cpp
-
-@COND_PLATFORM_MSDOS_1@basedll_dir.o: $(srcdir)/src/msdos/dir.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MSDOS_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msdos/dir.cpp
-
-@COND_PLATFORM_UNIX_1@basedll_dlunix.o: $(srcdir)/src/unix/dlunix.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/dlunix.cpp
-
-@COND_PLATFORM_MACOSX_1@basedll_dlunix.o: $(srcdir)/src/unix/dlunix.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/dlunix.cpp
-
-@COND_PLATFORM_UNIX_1@basedll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
-
-@COND_PLATFORM_MACOSX_1@basedll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
-
-@COND_PLATFORM_WIN32_1@basedll_snglinst.o: $(srcdir)/src/msw/snglinst.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/snglinst.cpp
-
-@COND_PLATFORM_UNIX_1@basedll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/stdpaths.cpp
-
-@COND_PLATFORM_MACOSX_1@basedll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/stdpaths.cpp
-
-@COND_PLATFORM_WIN32_1@basedll_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/stdpaths.cpp
-
-@COND_PLATFORM_OS2_1@basedll_stdpaths.o: $(srcdir)/src/os2/stdpaths.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/stdpaths.cpp
-
-@COND_PLATFORM_UNIX_1@basedll_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp
-
-@COND_PLATFORM_MACOSX_1@basedll_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp
-
-@COND_PLATFORM_OS2_1@basedll_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp
-
-@COND_PLATFORM_UNIX_1@basedll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/threadpsx.cpp
-
-@COND_PLATFORM_MACOSX_1@basedll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/threadpsx.cpp
-
-@COND_PLATFORM_UNIX_1@basedll_stackwalk.o: $(srcdir)/src/unix/stackwalk.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/stackwalk.cpp
-
-@COND_PLATFORM_MACOSX_1@basedll_stackwalk.o: $(srcdir)/src/unix/stackwalk.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/stackwalk.cpp
-
-@COND_PLATFORM_WIN32_1@basedll_stackwalk.o: $(srcdir)/src/msw/stackwalk.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/stackwalk.cpp
-
-@COND_PLATFORM_UNIX_1@basedll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
-
-@COND_PLATFORM_MACOSX_1@basedll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
-
-@COND_PLATFORM_UNIX_1@basedll_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp
-
-@COND_PLATFORM_WIN32_1@basedll_mimetype.o: $(srcdir)/src/msw/mimetype.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/mimetype.cpp
-
-@COND_PLATFORM_MACOSX_1@basedll_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/core/mimetype.cpp
-
-@COND_PLATFORM_OS2_1@basedll_mimetype.o: $(srcdir)/src/os2/mimetype.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/mimetype.cpp
-
-@COND_PLATFORM_MSDOS_1@basedll_mimetype.o: $(srcdir)/src/msdos/mimetype.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MSDOS_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msdos/mimetype.cpp
-
-@COND_PLATFORM_UNIX_1@basedll_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
-
-@COND_PLATFORM_OS2_1@basedll_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
-
-@COND_PLATFORM_WIN32_1@basedll_thread.o: $(srcdir)/src/msw/thread.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/thread.cpp
-
-@COND_PLATFORM_OS2_1@basedll_thread.o: $(srcdir)/src/os2/thread.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/thread.cpp
-
-@COND_PLATFORM_WIN32_1@basedll_utils.o: $(srcdir)/src/msw/utils.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/utils.cpp
-
-@COND_PLATFORM_OS2_1@basedll_utils.o: $(srcdir)/src/os2/utils.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/utils.cpp
-
-@COND_TOOLKIT_OSX_CARBON@basedll_utils.o: $(srcdir)/src/osx/carbon/utils.cpp $(BASEDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/utils.cpp
-
-@COND_TOOLKIT_OSX_COCOA@basedll_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(BASEDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm
-
-@COND_PLATFORM_WIN32_1@basedll_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/utilsexc.cpp
-
-@COND_PLATFORM_OS2_1@basedll_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/utilsexc.cpp
-
-baselib_appbase.o: $(srcdir)/src/common/appbase.cpp $(BASELIB_ODEP)
- $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/appbase.cpp
-
-baselib_arcall.o: $(srcdir)/src/common/arcall.cpp $(BASELIB_ODEP)
- $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/arcall.cpp
+baselib_arcall.o: $(srcdir)/src/common/arcall.cpp $(BASELIB_ODEP)
+ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/arcall.cpp
baselib_arcfind.o: $(srcdir)/src/common/arcfind.cpp $(BASELIB_ODEP)
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/arcfind.cpp
@@ -24068,6 +24156,9 @@ baselib_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp $(BASELIB_ODEP)
baselib_zstream.o: $(srcdir)/src/common/zstream.cpp $(BASELIB_ODEP)
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/zstream.cpp
+baselib_unix_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(BASELIB_ODEP)
+ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp
+
baselib_basemsw.o: $(srcdir)/src/msw/basemsw.cpp $(BASELIB_ODEP)
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/basemsw.cpp
@@ -24080,9 +24171,15 @@ baselib_debughlp.o: $(srcdir)/src/msw/debughlp.cpp $(BASELIB_ODEP)
baselib_dde.o: $(srcdir)/src/msw/dde.cpp $(BASELIB_ODEP)
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/dde.cpp
+baselib_msw_dir.o: $(srcdir)/src/msw/dir.cpp $(BASELIB_ODEP)
+ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/dir.cpp
+
baselib_dlmsw.o: $(srcdir)/src/msw/dlmsw.cpp $(BASELIB_ODEP)
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/dlmsw.cpp
+baselib_msw_mimetype.o: $(srcdir)/src/msw/mimetype.cpp $(BASELIB_ODEP)
+ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/mimetype.cpp
+
baselib_power.o: $(srcdir)/src/msw/power.cpp $(BASELIB_ODEP)
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/power.cpp
@@ -24092,12 +24189,33 @@ baselib_regconf.o: $(srcdir)/src/msw/regconf.cpp $(BASELIB_ODEP)
baselib_registry.o: $(srcdir)/src/msw/registry.cpp $(BASELIB_ODEP)
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/registry.cpp
+baselib_msw_snglinst.o: $(srcdir)/src/msw/snglinst.cpp $(BASELIB_ODEP)
+ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/snglinst.cpp
+
+baselib_msw_stackwalk.o: $(srcdir)/src/msw/stackwalk.cpp $(BASELIB_ODEP)
+ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/stackwalk.cpp
+
+baselib_msw_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(BASELIB_ODEP)
+ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/stdpaths.cpp
+
+baselib_msw_thread.o: $(srcdir)/src/msw/thread.cpp $(BASELIB_ODEP)
+ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/thread.cpp
+
baselib_timer.o: $(srcdir)/src/msw/timer.cpp $(BASELIB_ODEP)
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/timer.cpp
+baselib_msw_utils.o: $(srcdir)/src/msw/utils.cpp $(BASELIB_ODEP)
+ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/utils.cpp
+
+baselib_msw_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp $(BASELIB_ODEP)
+ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/utilsexc.cpp
+
baselib_time.o: $(srcdir)/src/msw/wince/time.cpp $(BASELIB_ODEP)
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/wince/time.cpp
+baselib_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(BASELIB_ODEP)
+ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/core/mimetype.cpp
+
baselib_cfstring.o: $(srcdir)/src/osx/core/cfstring.cpp $(BASELIB_ODEP)
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/core/cfstring.cpp
@@ -24107,11 +24225,35 @@ baselib_gsockosx.o: $(srcdir)/src/osx/core/gsockosx.cpp $(BASELIB_ODEP)
baselib_stdpaths_cf.o: $(srcdir)/src/osx/core/stdpaths_cf.cpp $(BASELIB_ODEP)
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/core/stdpaths_cf.cpp
-baselib_strconv_cf.o: $(srcdir)/src/osx/core/strconv_cf.cpp $(BASELIB_ODEP)
- $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/core/strconv_cf.cpp
+baselib_strconv_cf.o: $(srcdir)/src/osx/core/strconv_cf.cpp $(BASELIB_ODEP)
+ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/core/strconv_cf.cpp
+
+baselib_utilsexc_base.o: $(srcdir)/src/osx/core/utilsexc_base.cpp $(BASELIB_ODEP)
+ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_base.cpp
+
+baselib_os2_dir.o: $(srcdir)/src/os2/dir.cpp $(BASELIB_ODEP)
+ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/dir.cpp
+
+baselib_os2_mimetype.o: $(srcdir)/src/os2/mimetype.cpp $(BASELIB_ODEP)
+ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/mimetype.cpp
+
+baselib_os2_stdpaths.o: $(srcdir)/src/os2/stdpaths.cpp $(BASELIB_ODEP)
+ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/stdpaths.cpp
+
+baselib_os2_thread.o: $(srcdir)/src/os2/thread.cpp $(BASELIB_ODEP)
+ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/thread.cpp
+
+baselib_os2_utils.o: $(srcdir)/src/os2/utils.cpp $(BASELIB_ODEP)
+ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/utils.cpp
+
+baselib_os2_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp $(BASELIB_ODEP)
+ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/utilsexc.cpp
-baselib_utilsexc_base.o: $(srcdir)/src/osx/core/utilsexc_base.cpp $(BASELIB_ODEP)
- $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_base.cpp
+baselib_msdos_dir.o: $(srcdir)/src/msdos/dir.cpp $(BASELIB_ODEP)
+ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msdos/dir.cpp
+
+baselib_msdos_mimetype.o: $(srcdir)/src/msdos/mimetype.cpp $(BASELIB_ODEP)
+ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msdos/mimetype.cpp
baselib_utilsdos.o: $(srcdir)/src/msdos/utilsdos.cpp $(BASELIB_ODEP)
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msdos/utilsdos.cpp
@@ -24140,9 +24282,15 @@ baselib_mslu.o: $(srcdir)/src/msw/mslu.cpp $(BASELIB_ODEP)
baselib_volume.o: $(srcdir)/src/msw/volume.cpp $(BASELIB_ODEP)
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/volume.cpp
+baselib_carbon_utils.o: $(srcdir)/src/osx/carbon/utils.cpp $(BASELIB_ODEP)
+ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/utils.cpp
+
baselib_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(BASELIB_ODEP)
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/uma.cpp
+baselib_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(BASELIB_ODEP)
+ $(CXXC) -c -o $@ $(BASELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm
+
@COND_PLATFORM_UNIX_1@baselib_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(BASELIB_ODEP)
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp
@@ -24185,48 +24333,30 @@ baselib_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(BASELIB_ODEP)
@COND_PLATFORM_OS2_1@baselib_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(BASELIB_ODEP)
@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp
-@COND_PLATFORM_UNIX_1@baselib_dir.o: $(srcdir)/src/unix/dir.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_UNIX_1@baselib_unix_dir.o: $(srcdir)/src/unix/dir.cpp $(BASELIB_ODEP)
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/dir.cpp
-@COND_PLATFORM_MACOSX_1@baselib_dir.o: $(srcdir)/src/unix/dir.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1@baselib_unix_dir.o: $(srcdir)/src/unix/dir.cpp $(BASELIB_ODEP)
@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/dir.cpp
-@COND_PLATFORM_WIN32_1@baselib_dir.o: $(srcdir)/src/msw/dir.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/dir.cpp
-
-@COND_PLATFORM_OS2_1@baselib_dir.o: $(srcdir)/src/os2/dir.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/dir.cpp
-
-@COND_PLATFORM_MSDOS_1@baselib_dir.o: $(srcdir)/src/msdos/dir.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_MSDOS_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msdos/dir.cpp
-
@COND_PLATFORM_UNIX_1@baselib_dlunix.o: $(srcdir)/src/unix/dlunix.cpp $(BASELIB_ODEP)
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/dlunix.cpp
@COND_PLATFORM_MACOSX_1@baselib_dlunix.o: $(srcdir)/src/unix/dlunix.cpp $(BASELIB_ODEP)
@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/dlunix.cpp
-@COND_PLATFORM_UNIX_1@baselib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_UNIX_1@baselib_unix_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(BASELIB_ODEP)
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
-@COND_PLATFORM_MACOSX_1@baselib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1@baselib_unix_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(BASELIB_ODEP)
@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
-@COND_PLATFORM_WIN32_1@baselib_snglinst.o: $(srcdir)/src/msw/snglinst.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/snglinst.cpp
-
-@COND_PLATFORM_UNIX_1@baselib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_UNIX_1@baselib_unix_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASELIB_ODEP)
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/stdpaths.cpp
-@COND_PLATFORM_MACOSX_1@baselib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1@baselib_unix_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASELIB_ODEP)
@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/stdpaths.cpp
-@COND_PLATFORM_WIN32_1@baselib_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/stdpaths.cpp
-
-@COND_PLATFORM_OS2_1@baselib_stdpaths.o: $(srcdir)/src/os2/stdpaths.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/stdpaths.cpp
-
@COND_PLATFORM_UNIX_1@baselib_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(BASELIB_ODEP)
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp
@@ -24242,66 +24372,24 @@ baselib_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(BASELIB_ODEP)
@COND_PLATFORM_MACOSX_1@baselib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(BASELIB_ODEP)
@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/threadpsx.cpp
-@COND_PLATFORM_UNIX_1@baselib_stackwalk.o: $(srcdir)/src/unix/stackwalk.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_UNIX_1@baselib_unix_stackwalk.o: $(srcdir)/src/unix/stackwalk.cpp $(BASELIB_ODEP)
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/stackwalk.cpp
-@COND_PLATFORM_MACOSX_1@baselib_stackwalk.o: $(srcdir)/src/unix/stackwalk.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1@baselib_unix_stackwalk.o: $(srcdir)/src/unix/stackwalk.cpp $(BASELIB_ODEP)
@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/stackwalk.cpp
-@COND_PLATFORM_WIN32_1@baselib_stackwalk.o: $(srcdir)/src/msw/stackwalk.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/stackwalk.cpp
-
@COND_PLATFORM_UNIX_1@baselib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(BASELIB_ODEP)
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
@COND_PLATFORM_MACOSX_1@baselib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(BASELIB_ODEP)
@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
-@COND_PLATFORM_UNIX_1@baselib_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp
-
-@COND_PLATFORM_WIN32_1@baselib_mimetype.o: $(srcdir)/src/msw/mimetype.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/mimetype.cpp
-
-@COND_PLATFORM_MACOSX_1@baselib_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/core/mimetype.cpp
-
-@COND_PLATFORM_OS2_1@baselib_mimetype.o: $(srcdir)/src/os2/mimetype.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/mimetype.cpp
-
-@COND_PLATFORM_MSDOS_1@baselib_mimetype.o: $(srcdir)/src/msdos/mimetype.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_MSDOS_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msdos/mimetype.cpp
-
@COND_PLATFORM_UNIX_1@baselib_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(BASELIB_ODEP)
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
@COND_PLATFORM_OS2_1@baselib_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(BASELIB_ODEP)
@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
-@COND_PLATFORM_WIN32_1@baselib_thread.o: $(srcdir)/src/msw/thread.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/thread.cpp
-
-@COND_PLATFORM_OS2_1@baselib_thread.o: $(srcdir)/src/os2/thread.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/thread.cpp
-
-@COND_PLATFORM_WIN32_1@baselib_utils.o: $(srcdir)/src/msw/utils.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/utils.cpp
-
-@COND_PLATFORM_OS2_1@baselib_utils.o: $(srcdir)/src/os2/utils.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/utils.cpp
-
-@COND_TOOLKIT_OSX_CARBON@baselib_utils.o: $(srcdir)/src/osx/carbon/utils.cpp $(BASELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/utils.cpp
-
-@COND_TOOLKIT_OSX_COCOA@baselib_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(BASELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm
-
-@COND_PLATFORM_WIN32_1@baselib_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/utilsexc.cpp
-
-@COND_PLATFORM_OS2_1@baselib_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/utilsexc.cpp
-
netdll_version_rc.o: $(srcdir)/src/msw/version.rc $(NETDLL_ODEP)
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_NET
@@ -24335,6 +24423,9 @@ netdll_socket.o: $(srcdir)/src/common/socket.cpp $(NETDLL_ODEP)
netdll_url.o: $(srcdir)/src/common/url.cpp $(NETDLL_ODEP)
$(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/common/url.cpp
+netdll_msw_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(NETDLL_ODEP)
+ $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/msw/gsocket.cpp
+
netdll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.cpp $(NETDLL_ODEP)
$(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/msw/gsockmsw.cpp
@@ -24344,18 +24435,15 @@ netdll_urlmsw.o: $(srcdir)/src/msw/urlmsw.cpp $(NETDLL_ODEP)
netdll_net.o: $(srcdir)/src/msw/wince/net.cpp $(NETDLL_ODEP)
$(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/msw/wince/net.cpp
-@COND_PLATFORM_UNIX_1@netdll_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETDLL_ODEP)
+@COND_PLATFORM_UNIX_1@netdll_unix_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETDLL_ODEP)
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp
-@COND_PLATFORM_MACOSX_1@netdll_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETDLL_ODEP)
+@COND_PLATFORM_MACOSX_1@netdll_unix_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETDLL_ODEP)
@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp
-@COND_PLATFORM_OS2_1@netdll_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETDLL_ODEP)
+@COND_PLATFORM_OS2_1@netdll_unix_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETDLL_ODEP)
@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp
-@COND_PLATFORM_WIN32_1@netdll_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(NETDLL_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/msw/gsocket.cpp
-
netlib_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(NETLIB_ODEP)
$(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/common/fs_inet.cpp
@@ -24386,6 +24474,9 @@ netlib_socket.o: $(srcdir)/src/common/socket.cpp $(NETLIB_ODEP)
netlib_url.o: $(srcdir)/src/common/url.cpp $(NETLIB_ODEP)
$(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/common/url.cpp
+netlib_msw_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(NETLIB_ODEP)
+ $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/msw/gsocket.cpp
+
netlib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.cpp $(NETLIB_ODEP)
$(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/msw/gsockmsw.cpp
@@ -24395,18 +24486,15 @@ netlib_urlmsw.o: $(srcdir)/src/msw/urlmsw.cpp $(NETLIB_ODEP)
netlib_net.o: $(srcdir)/src/msw/wince/net.cpp $(NETLIB_ODEP)
$(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/msw/wince/net.cpp
-@COND_PLATFORM_UNIX_1@netlib_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETLIB_ODEP)
+@COND_PLATFORM_UNIX_1@netlib_unix_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETLIB_ODEP)
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp
-@COND_PLATFORM_MACOSX_1@netlib_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETLIB_ODEP)
+@COND_PLATFORM_MACOSX_1@netlib_unix_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETLIB_ODEP)
@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp
-@COND_PLATFORM_OS2_1@netlib_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETLIB_ODEP)
+@COND_PLATFORM_OS2_1@netlib_unix_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETLIB_ODEP)
@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp
-@COND_PLATFORM_WIN32_1@netlib_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(NETLIB_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/msw/gsocket.cpp
-
coredll_version_rc.o: $(srcdir)/src/msw/version.rc $(COREDLL_ODEP)
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_CORE --define wxUSE_BASE=0
@@ -24422,2813 +24510,2537 @@ coredll_msgout.o: $(srcdir)/src/common/msgout.cpp $(COREDLL_ODEP)
coredll_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/utilscmn.cpp
+coredll_msw_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp
+
+coredll_msw_main.o: $(srcdir)/src/msw/main.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/main.cpp
+
coredll_mslu.o: $(srcdir)/src/msw/mslu.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/mslu.cpp
coredll_volume.o: $(srcdir)/src/msw/volume.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/volume.cpp
+coredll_carbon_utils.o: $(srcdir)/src/osx/carbon/utils.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/utils.cpp
+
coredll_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/uma.cpp
+coredll_osx_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm
+
coredll_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp
-coredll_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp
-
-coredll_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp
-
-coredll_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/clrpicker.cpp
-
-coredll_fontpicker.o: $(srcdir)/src/gtk/fontpicker.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/fontpicker.cpp
-
-coredll_filepicker.o: $(srcdir)/src/gtk/filepicker.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/filepicker.cpp
-
-coredll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/gnome/gprint.cpp
-
-coredll_gvfs.o: $(srcdir)/src/gtk/gnome/gvfs.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/gnome/gvfs.cpp
-
-coredll_mnemonics.o: $(srcdir)/src/gtk/mnemonics.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/mnemonics.cpp
-
-coredll_treeentry_gtk.o: $(srcdir)/src/gtk/treeentry_gtk.c $(COREDLL_ODEP)
- $(CCC) -c -o $@ $(COREDLL_CFLAGS) $(srcdir)/src/gtk/treeentry_gtk.c
-
-coredll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/bmpmotif.cpp
-
-coredll_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/combobox_native.cpp
-
-coredll_gsockmot.o: $(srcdir)/src/motif/gsockmot.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/gsockmot.cpp
-
-coredll_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c $(COREDLL_ODEP)
- $(CCC) -c -o $@ $(COREDLL_CFLAGS) $(srcdir)/src/motif/xmcombo/xmcombo.c
-
-coredll_choicece.o: $(srcdir)/src/msw/wince/choicece.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/wince/choicece.cpp
-
-coredll_crt.o: $(srcdir)/src/msw/wince/crt.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/wince/crt.cpp
-
-coredll_filedlgwce.o: $(srcdir)/src/msw/wince/filedlgwce.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/wince/filedlgwce.cpp
-
-coredll_filefnwce.o: $(srcdir)/src/msw/wince/filefnwce.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/wince/filefnwce.cpp
-
-coredll_helpwce.o: $(srcdir)/src/msw/wince/helpwce.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/wince/helpwce.cpp
-
-coredll_menuce.o: $(srcdir)/src/msw/wince/menuce.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/wince/menuce.cpp
-
-coredll_tbarwce.o: $(srcdir)/src/msw/wince/tbarwce.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/wince/tbarwce.cpp
-
-coredll_textctrlce.o: $(srcdir)/src/msw/wince/textctrlce.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/wince/textctrlce.cpp
-
-coredll_listctrl_mac.o: $(srcdir)/src/osx/carbon/listctrl_mac.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/listctrl_mac.cpp
-
-coredll_notebmac.o: $(srcdir)/src/osx/carbon/notebmac.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/notebmac.cpp
-
-coredll_statlmac.o: $(srcdir)/src/osx/carbon/statlmac.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statlmac.cpp
-
-coredll_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/html/htmlctrl/webkit/webkit.mm
-
-coredll_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/NSBox.mm
-
-coredll_NSButton.o: $(srcdir)/src/cocoa/NSButton.mm $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/NSButton.mm
-
-coredll_NSControl.o: $(srcdir)/src/cocoa/NSControl.mm $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/NSControl.mm
-
-coredll_NSMenu.o: $(srcdir)/src/cocoa/NSMenu.mm $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/NSMenu.mm
-
-coredll_NSPanel.o: $(srcdir)/src/cocoa/NSPanel.mm $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/NSPanel.mm
-
-coredll_NSScroller.o: $(srcdir)/src/cocoa/NSScroller.mm $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/NSScroller.mm
-
-coredll_NSSlider.o: $(srcdir)/src/cocoa/NSSlider.mm $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/NSSlider.mm
-
-coredll_NSTabView.o: $(srcdir)/src/cocoa/NSTabView.mm $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/NSTabView.mm
-
-coredll_NSTableView.o: $(srcdir)/src/cocoa/NSTableView.mm $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/NSTableView.mm
-
-coredll_NSTextField.o: $(srcdir)/src/cocoa/NSTextField.mm $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/NSTextField.mm
-
-coredll_NSView.o: $(srcdir)/src/cocoa/NSView.mm $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/NSView.mm
-
-coredll_NSWindow.o: $(srcdir)/src/cocoa/NSWindow.mm $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/NSWindow.mm
-
-coredll_ObjcRef.o: $(srcdir)/src/cocoa/ObjcRef.mm $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/ObjcRef.mm
-
-coredll_drawer.o: $(srcdir)/src/cocoa/drawer.mm $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/drawer.mm
-
-coredll_mbarman.o: $(srcdir)/src/cocoa/mbarman.mm $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/mbarman.mm
-
-coredll_sound.o: $(srcdir)/src/cocoa/sound.mm $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/sound.mm
-
-coredll_statline2.o: $(srcdir)/src/cocoa/statline2.mm $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/statline2.mm
-
-coredll_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.mm $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/utilsexc.mm
-
-coredll_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/gsockpm.cpp
-
-coredll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/ctrlrend.cpp
-
-coredll_framuniv.o: $(srcdir)/src/univ/framuniv.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/framuniv.cpp
-
-coredll_inpcons.o: $(srcdir)/src/univ/inpcons.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/inpcons.cpp
-
-coredll_inphand.o: $(srcdir)/src/univ/inphand.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/inphand.cpp
-
-coredll_scrarrow.o: $(srcdir)/src/univ/scrarrow.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/scrarrow.cpp
-
-coredll_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/scrthumb.cpp
-
-coredll_settingsuniv.o: $(srcdir)/src/univ/settingsuniv.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/settingsuniv.cpp
-
-coredll_stdrend.o: $(srcdir)/src/univ/stdrend.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/stdrend.cpp
-
-coredll_theme.o: $(srcdir)/src/univ/theme.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/theme.cpp
-
-coredll_topluniv.o: $(srcdir)/src/univ/topluniv.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/topluniv.cpp
-
-coredll_winuniv.o: $(srcdir)/src/univ/winuniv.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/winuniv.cpp
-
-coredll_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/themes/gtk.cpp
-
-coredll_metal.o: $(srcdir)/src/univ/themes/metal.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/themes/metal.cpp
-
-coredll_mono.o: $(srcdir)/src/univ/themes/mono.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/themes/mono.cpp
-
-coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/themes/win32.cpp
-
-@COND_PLATFORM_WIN32_1@coredll_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/evtloop.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_evtloop.o: $(srcdir)/src/gtk1/evtloop.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/evtloop.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_evtloop.o: $(srcdir)/src/x11/evtloop.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/evtloop.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/evtloop.cpp
-
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_evtloop.o: $(srcdir)/src/dfb/evtloop.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/evtloop.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_evtloop.o: $(srcdir)/src/motif/evtloop.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/evtloop.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_evtloop.o: $(srcdir)/src/osx/carbon/evtloop.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/evtloop.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_evtloop.o: $(srcdir)/src/osx/cocoa/evtloop.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/evtloop.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/evtloop.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_evtloop.o: $(srcdir)/src/os2/evtloop.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/evtloop.cpp
-
-@COND_PLATFORM_WIN32_1@coredll_main.o: $(srcdir)/src/msw/main.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/main.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_main.o: $(srcdir)/src/gtk1/main.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/main.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_main.o: $(srcdir)/src/motif/main.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/main.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_main.o: $(srcdir)/src/cocoa/main.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/main.cpp
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_main.o: $(srcdir)/src/os2/main.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/main.cpp
-
-@COND_TOOLKIT_OSX_CARBON@coredll_utils.o: $(srcdir)/src/osx/carbon/utils.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/utils.cpp
-
-@COND_TOOLKIT_OSX_COCOA@coredll_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm
-
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_utils.o: $(srcdir)/src/x11/utils.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/utils.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_utils.o: $(srcdir)/src/mgl/utils.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/utils.cpp
-
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_utils.o: $(srcdir)/src/dfb/utils.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/utils.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_utils.o: $(srcdir)/src/motif/utils.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/utils.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_utils.o: $(srcdir)/src/cocoa/utils.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/utils.mm
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_caret.o: $(srcdir)/src/msw/caret.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/caret.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_caret.o: $(srcdir)/src/msw/caret.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/caret.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+coredll_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+coredll_gtk_bmpbuttn.o: $(srcdir)/src/gtk/bmpbuttn.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/bmpbuttn.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+coredll_gtk_button.o: $(srcdir)/src/gtk/button.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/button.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+coredll_gtk_checkbox.o: $(srcdir)/src/gtk/checkbox.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/checkbox.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+coredll_gtk_checklst.o: $(srcdir)/src/gtk/checklst.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/checklst.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
+coredll_gtk_choice.o: $(srcdir)/src/gtk/choice.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/choice.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
+coredll_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
+coredll_gtk_colordlg.o: $(srcdir)/src/gtk/colordlg.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/colordlg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
+coredll_gtk_combobox.o: $(srcdir)/src/gtk/combobox.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/combobox.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_dialup.o: $(srcdir)/src/unix/dialup.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
+coredll_gtk_control.o: $(srcdir)/src/gtk/control.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/control.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_dialup.o: $(srcdir)/src/unix/dialup.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
+coredll_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/clrpicker.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_dialup.o: $(srcdir)/src/unix/dialup.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
+coredll_gtk_dialog.o: $(srcdir)/src/gtk/dialog.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/dialog.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_dialup.o: $(srcdir)/src/unix/dialup.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
+coredll_fontpicker.o: $(srcdir)/src/gtk/fontpicker.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/fontpicker.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_dialup.o: $(srcdir)/src/msw/dialup.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp
+coredll_filepicker.o: $(srcdir)/src/gtk/filepicker.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/filepicker.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_dialup.o: $(srcdir)/src/msw/dialup.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp
+coredll_gtk_dirdlg.o: $(srcdir)/src/gtk/dirdlg.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/dirdlg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
+coredll_gtk_filedlg.o: $(srcdir)/src/gtk/filedlg.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/filedlg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
+coredll_gtk_fontdlg.o: $(srcdir)/src/gtk/fontdlg.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/fontdlg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
+coredll_gtk_frame.o: $(srcdir)/src/gtk/frame.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/frame.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
+coredll_gtk_gauge.o: $(srcdir)/src/gtk/gauge.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/gauge.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp
+coredll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/gnome/gprint.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp
+coredll_gvfs.o: $(srcdir)/src/gtk/gnome/gvfs.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/gnome/gvfs.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
+coredll_gtk_print.o: $(srcdir)/src/gtk/print.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/print.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
+coredll_gtk_listbox.o: $(srcdir)/src/gtk/listbox.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/listbox.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_fontenum.o: $(srcdir)/src/mgl/fontenum.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/fontenum.cpp
+coredll_gtk_mdi.o: $(srcdir)/src/gtk/mdi.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/mdi.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_fontenum.o: $(srcdir)/src/dfb/fontenum.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/fontenum.cpp
+coredll_gtk_menu.o: $(srcdir)/src/gtk/menu.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/menu.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontenum.o: $(srcdir)/src/cocoa/fontenum.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/fontenum.mm
+coredll_mnemonics.o: $(srcdir)/src/gtk/mnemonics.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/mnemonics.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_fontenum.o: $(srcdir)/src/os2/fontenum.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/fontenum.cpp
+coredll_gtk_msgdlg.o: $(srcdir)/src/gtk/msgdlg.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/msgdlg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
+coredll_gtk_nativewin.o: $(srcdir)/src/gtk/nativewin.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/nativewin.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
+coredll_gtk_notebook.o: $(srcdir)/src/gtk/notebook.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/notebook.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
+coredll_gtk_radiobox.o: $(srcdir)/src/gtk/radiobox.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/radiobox.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
+coredll_gtk_radiobut.o: $(srcdir)/src/gtk/radiobut.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/radiobut.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp
+coredll_gtk_scrolbar.o: $(srcdir)/src/gtk/scrolbar.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/scrolbar.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp
+coredll_gtk_scrolwin.o: $(srcdir)/src/gtk/scrolwin.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/scrolwin.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
+coredll_gtk_slider.o: $(srcdir)/src/gtk/slider.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/slider.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
+coredll_gtk_spinbutt.o: $(srcdir)/src/gtk/spinbutt.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/spinbutt.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_fontutil.o: $(srcdir)/src/mgl/fontutil.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/fontutil.cpp
+coredll_gtk_spinctrl.o: $(srcdir)/src/gtk/spinctrl.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/spinctrl.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontutil.o: $(srcdir)/src/cocoa/fontutil.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/fontutil.cpp
+coredll_gtk_statbmp.o: $(srcdir)/src/gtk/statbmp.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/statbmp.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_fontutil.o: $(srcdir)/src/os2/fontutil.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/fontutil.cpp
+coredll_gtk_statbox.o: $(srcdir)/src/gtk/statbox.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/statbox.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
+coredll_gtk_statline.o: $(srcdir)/src/gtk/statline.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/statline.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
+coredll_gtk_stattext.o: $(srcdir)/src/gtk/stattext.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/stattext.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
+coredll_gtk_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/tbargtk.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
+coredll_gtk_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/textctrl.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+coredll_gtk_textentry.o: $(srcdir)/src/gtk/textentry.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/textentry.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+coredll_gtk_tglbtn.o: $(srcdir)/src/gtk/tglbtn.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/tglbtn.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+coredll_treeentry_gtk.o: $(srcdir)/src/gtk/treeentry_gtk.c $(COREDLL_ODEP)
+ $(CCC) -c -o $@ $(COREDLL_CFLAGS) $(srcdir)/src/gtk/treeentry_gtk.c
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+coredll_gtk1_bmpbuttn.o: $(srcdir)/src/gtk1/bmpbuttn.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/bmpbuttn.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+coredll_gtk1_button.o: $(srcdir)/src/gtk1/button.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/button.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+coredll_gtk1_checkbox.o: $(srcdir)/src/gtk1/checkbox.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/checkbox.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+coredll_gtk1_checklst.o: $(srcdir)/src/gtk1/checklst.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/checklst.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+coredll_gtk1_choice.o: $(srcdir)/src/gtk1/choice.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/choice.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+coredll_gtk1_combobox.o: $(srcdir)/src/gtk1/combobox.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/combobox.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_icon.o: $(srcdir)/src/msw/icon.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
+coredll_gtk1_control.o: $(srcdir)/src/gtk1/control.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/control.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_icon.o: $(srcdir)/src/msw/icon.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
+coredll_gtk1_dialog.o: $(srcdir)/src/gtk1/dialog.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/dialog.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_icon.o: $(srcdir)/src/motif/icon.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/icon.cpp
+coredll_gtk1_filedlg.o: $(srcdir)/src/gtk1/filedlg.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/filedlg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
+coredll_gtk1_fontdlg.o: $(srcdir)/src/gtk1/fontdlg.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/fontdlg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
+coredll_gtk1_frame.o: $(srcdir)/src/gtk1/frame.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/frame.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_icon.o: $(srcdir)/src/cocoa/icon.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/icon.mm
+coredll_gtk1_gauge.o: $(srcdir)/src/gtk1/gauge.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/gauge.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_icon.o: $(srcdir)/src/os2/icon.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/icon.cpp
+coredll_gtk1_listbox.o: $(srcdir)/src/gtk1/listbox.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/listbox.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
+coredll_gtk1_mdi.o: $(srcdir)/src/gtk1/mdi.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/mdi.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
+coredll_gtk1_menu.o: $(srcdir)/src/gtk1/menu.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/menu.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
+coredll_gtk1_notebook.o: $(srcdir)/src/gtk1/notebook.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/notebook.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_app.o: $(srcdir)/src/gtk/app.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/app.cpp
+coredll_gtk1_radiobox.o: $(srcdir)/src/gtk1/radiobox.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/radiobox.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_app.o: $(srcdir)/src/gtk1/app.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/app.cpp
+coredll_gtk1_radiobut.o: $(srcdir)/src/gtk1/radiobut.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/radiobut.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_app.o: $(srcdir)/src/msw/app.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/app.cpp
+coredll_gtk1_scrolbar.o: $(srcdir)/src/gtk1/scrolbar.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/scrolbar.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_app.o: $(srcdir)/src/msw/app.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/app.cpp
+coredll_gtk1_scrolwin.o: $(srcdir)/src/gtk1/scrolwin.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/scrolwin.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_app.o: $(srcdir)/src/x11/app.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/app.cpp
+coredll_gtk1_slider.o: $(srcdir)/src/gtk1/slider.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/slider.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_app.o: $(srcdir)/src/mgl/app.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/app.cpp
+coredll_gtk1_spinbutt.o: $(srcdir)/src/gtk1/spinbutt.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/spinbutt.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_app.o: $(srcdir)/src/dfb/app.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/app.cpp
+coredll_gtk1_spinctrl.o: $(srcdir)/src/gtk1/spinctrl.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/spinctrl.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_app.o: $(srcdir)/src/motif/app.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/app.cpp
+coredll_gtk1_statbmp.o: $(srcdir)/src/gtk1/statbmp.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/statbmp.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_app.o: $(srcdir)/src/osx/carbon/app.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
+coredll_gtk1_statbox.o: $(srcdir)/src/gtk1/statbox.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/statbox.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_app.o: $(srcdir)/src/osx/carbon/app.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
+coredll_gtk1_statline.o: $(srcdir)/src/gtk1/statline.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/statline.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_app.o: $(srcdir)/src/cocoa/app.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/app.mm
+coredll_gtk1_stattext.o: $(srcdir)/src/gtk1/stattext.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/stattext.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_app.o: $(srcdir)/src/os2/app.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/app.cpp
+coredll_gtk1_tbargtk.o: $(srcdir)/src/gtk1/tbargtk.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/tbargtk.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.c $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CCC) -c -o $@ $(COREDLL_CFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.c
+coredll_gtk1_textctrl.o: $(srcdir)/src/gtk1/textctrl.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/textctrl.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/bitmap.cpp
+coredll_gtk1_tglbtn.o: $(srcdir)/src/gtk1/tglbtn.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/tglbtn.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_bitmap.o: $(srcdir)/src/gtk1/bitmap.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/bitmap.cpp
+coredll_motif_accel.o: $(srcdir)/src/motif/accel.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/accel.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
+coredll_motif_app.o: $(srcdir)/src/motif/app.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/app.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
+coredll_motif_bmpbuttn.o: $(srcdir)/src/motif/bmpbuttn.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/bmpbuttn.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp
+coredll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/bmpmotif.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp
+coredll_motif_button.o: $(srcdir)/src/motif/button.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/button.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
+coredll_motif_checkbox.o: $(srcdir)/src/motif/checkbox.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/checkbox.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
+coredll_motif_checklst.o: $(srcdir)/src/motif/checklst.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/checklst.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_bitmap.o: $(srcdir)/src/mgl/bitmap.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/bitmap.cpp
+coredll_motif_choice.o: $(srcdir)/src/motif/choice.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/choice.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_bitmap.o: $(srcdir)/src/dfb/bitmap.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/bitmap.cpp
+coredll_motif_clipbrd.o: $(srcdir)/src/motif/clipbrd.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/clipbrd.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_bitmap.o: $(srcdir)/src/cocoa/bitmap.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/bitmap.mm
+coredll_motif_colour.o: $(srcdir)/src/motif/colour.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/colour.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_bitmap.o: $(srcdir)/src/os2/bitmap.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/bitmap.cpp
+coredll_motif_combobox.o: $(srcdir)/src/motif/combobox.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/combobox.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_brush.o: $(srcdir)/src/gtk/brush.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/brush.cpp
+coredll_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/combobox_native.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_brush.o: $(srcdir)/src/gtk1/brush.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/brush.cpp
+coredll_motif_control.o: $(srcdir)/src/motif/control.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/control.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_brush.o: $(srcdir)/src/x11/brush.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
+coredll_motif_cursor.o: $(srcdir)/src/motif/cursor.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/cursor.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_brush.o: $(srcdir)/src/x11/brush.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
+coredll_motif_data.o: $(srcdir)/src/motif/data.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/data.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_brush.o: $(srcdir)/src/msw/brush.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/brush.cpp
+coredll_motif_dataobj.o: $(srcdir)/src/motif/dataobj.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/dataobj.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_brush.o: $(srcdir)/src/msw/brush.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/brush.cpp
+coredll_motif_dc.o: $(srcdir)/src/motif/dc.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/dc.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_brush.o: $(srcdir)/src/osx/brush.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
+coredll_motif_dcclient.o: $(srcdir)/src/motif/dcclient.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/dcclient.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_brush.o: $(srcdir)/src/osx/brush.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
+coredll_motif_dcmemory.o: $(srcdir)/src/motif/dcmemory.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/dcmemory.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_brush.o: $(srcdir)/src/mgl/brush.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/brush.cpp
+coredll_motif_dcscreen.o: $(srcdir)/src/motif/dcscreen.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/dcscreen.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_brush.o: $(srcdir)/src/dfb/brush.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/brush.cpp
+coredll_motif_dialog.o: $(srcdir)/src/motif/dialog.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/dialog.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_brush.o: $(srcdir)/src/cocoa/brush.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/brush.mm
+coredll_motif_evtloop.o: $(srcdir)/src/motif/evtloop.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/evtloop.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_brush.o: $(srcdir)/src/os2/brush.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/brush.cpp
+coredll_motif_filedlg.o: $(srcdir)/src/motif/filedlg.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/filedlg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_clipbrd.o: $(srcdir)/src/gtk/clipbrd.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/clipbrd.cpp
+coredll_motif_font.o: $(srcdir)/src/motif/font.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/font.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_clipbrd.o: $(srcdir)/src/gtk1/clipbrd.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/clipbrd.cpp
+coredll_motif_frame.o: $(srcdir)/src/motif/frame.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/frame.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/clipbrd.cpp
+coredll_motif_gauge.o: $(srcdir)/src/motif/gauge.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/gauge.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/clipbrd.cpp
+coredll_gsockmot.o: $(srcdir)/src/motif/gsockmot.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/gsockmot.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_clipbrd.o: $(srcdir)/src/x11/clipbrd.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/clipbrd.cpp
+coredll_motif_icon.o: $(srcdir)/src/motif/icon.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/icon.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_clipbrd.o: $(srcdir)/src/mgl/clipbrd.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/clipbrd.cpp
+coredll_motif_listbox.o: $(srcdir)/src/motif/listbox.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/listbox.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_clipbrd.o: $(srcdir)/src/motif/clipbrd.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/clipbrd.cpp
+coredll_motif_main.o: $(srcdir)/src/motif/main.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/main.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
+coredll_motif_mdi.o: $(srcdir)/src/motif/mdi.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/mdi.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
+coredll_motif_menu.o: $(srcdir)/src/motif/menu.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/menu.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_clipbrd.o: $(srcdir)/src/cocoa/clipbrd.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/clipbrd.mm
+coredll_motif_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/menuitem.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_clipbrd.o: $(srcdir)/src/os2/clipbrd.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/clipbrd.cpp
+coredll_motif_minifram.o: $(srcdir)/src/motif/minifram.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/minifram.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_colour.o: $(srcdir)/src/gtk/colour.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/colour.cpp
+coredll_motif_msgdlg.o: $(srcdir)/src/motif/msgdlg.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/msgdlg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_colour.o: $(srcdir)/src/gtk1/colour.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/colour.cpp
+coredll_motif_popupwin.o: $(srcdir)/src/motif/popupwin.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/popupwin.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_colour.o: $(srcdir)/src/msw/colour.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/colour.cpp
+coredll_motif_radiobox.o: $(srcdir)/src/motif/radiobox.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/radiobox.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_colour.o: $(srcdir)/src/msw/colour.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/colour.cpp
+coredll_motif_radiobut.o: $(srcdir)/src/motif/radiobut.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/radiobut.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_colour.o: $(srcdir)/src/osx/core/colour.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
+coredll_motif_scrolbar.o: $(srcdir)/src/motif/scrolbar.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/scrolbar.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_colour.o: $(srcdir)/src/osx/core/colour.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
+coredll_motif_settings.o: $(srcdir)/src/motif/settings.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/settings.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_colour.o: $(srcdir)/src/x11/colour.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/colour.cpp
+coredll_motif_slider.o: $(srcdir)/src/motif/slider.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/slider.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_colour.o: $(srcdir)/src/generic/colour.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
+coredll_motif_spinbutt.o: $(srcdir)/src/motif/spinbutt.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/spinbutt.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_colour.o: $(srcdir)/src/generic/colour.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
+coredll_motif_statbmp.o: $(srcdir)/src/motif/statbmp.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/statbmp.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_colour.o: $(srcdir)/src/motif/colour.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/colour.cpp
+coredll_motif_statbox.o: $(srcdir)/src/motif/statbox.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/statbox.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_colour.o: $(srcdir)/src/cocoa/colour.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/colour.mm
+coredll_motif_stattext.o: $(srcdir)/src/motif/stattext.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/stattext.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_colour.o: $(srcdir)/src/os2/colour.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/colour.cpp
+coredll_motif_textctrl.o: $(srcdir)/src/motif/textctrl.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/textctrl.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_cursor.o: $(srcdir)/src/gtk/cursor.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/cursor.cpp
+coredll_motif_textentry.o: $(srcdir)/src/motif/textentry.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/textentry.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_cursor.o: $(srcdir)/src/gtk1/cursor.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/cursor.cpp
+coredll_motif_timer.o: $(srcdir)/src/motif/timer.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/timer.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_cursor.o: $(srcdir)/src/msw/cursor.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/cursor.cpp
+coredll_motif_toolbar.o: $(srcdir)/src/motif/toolbar.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/toolbar.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_cursor.o: $(srcdir)/src/msw/cursor.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/cursor.cpp
+coredll_motif_toplevel.o: $(srcdir)/src/motif/toplevel.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/toplevel.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_cursor.o: $(srcdir)/src/x11/cursor.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/cursor.cpp
+coredll_motif_utils.o: $(srcdir)/src/motif/utils.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/utils.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_cursor.o: $(srcdir)/src/mgl/cursor.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/cursor.cpp
+coredll_motif_window.o: $(srcdir)/src/motif/window.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/window.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_cursor.o: $(srcdir)/src/dfb/cursor.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/cursor.cpp
+coredll_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c $(COREDLL_ODEP)
+ $(CCC) -c -o $@ $(COREDLL_CFLAGS) $(srcdir)/src/motif/xmcombo/xmcombo.c
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_cursor.o: $(srcdir)/src/motif/cursor.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/cursor.cpp
+coredll_generic_notebook.o: $(srcdir)/src/generic/notebook.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/notebook.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
+coredll_generic_statline.o: $(srcdir)/src/generic/statline.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statline.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
+coredll_msw_checklst.o: $(srcdir)/src/msw/checklst.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_cursor.o: $(srcdir)/src/cocoa/cursor.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/cursor.mm
+coredll_msw_fdrepdlg.o: $(srcdir)/src/msw/fdrepdlg.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/fdrepdlg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_cursor.o: $(srcdir)/src/os2/cursor.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/cursor.cpp
+coredll_msw_fontdlg.o: $(srcdir)/src/msw/fontdlg.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/fontdlg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_dataobj.o: $(srcdir)/src/gtk/dataobj.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/dataobj.cpp
+coredll_wince_checklst.o: $(srcdir)/src/msw/wince/checklst.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/wince/checklst.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_dataobj.o: $(srcdir)/src/gtk1/dataobj.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/dataobj.cpp
+coredll_choicece.o: $(srcdir)/src/msw/wince/choicece.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/wince/choicece.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/dataobj.cpp
+coredll_crt.o: $(srcdir)/src/msw/wince/crt.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/wince/crt.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/dataobj.cpp
+coredll_filedlgwce.o: $(srcdir)/src/msw/wince/filedlgwce.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/wince/filedlgwce.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_dataobj.o: $(srcdir)/src/x11/dataobj.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/dataobj.cpp
+coredll_filefnwce.o: $(srcdir)/src/msw/wince/filefnwce.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/wince/filefnwce.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_dataobj.o: $(srcdir)/src/motif/dataobj.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/dataobj.cpp
+coredll_helpwce.o: $(srcdir)/src/msw/wince/helpwce.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/wince/helpwce.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
+coredll_menuce.o: $(srcdir)/src/msw/wince/menuce.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/wince/menuce.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
+coredll_tbarwce.o: $(srcdir)/src/msw/wince/tbarwce.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/wince/tbarwce.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_dataobj.o: $(srcdir)/src/cocoa/dataobj.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/dataobj.mm
+coredll_textctrlce.o: $(srcdir)/src/msw/wince/textctrlce.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/wince/textctrlce.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dataobj.o: $(srcdir)/src/os2/dataobj.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dataobj.cpp
+coredll_carbon_bmpbuttn.o: $(srcdir)/src/osx/carbon/bmpbuttn.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/bmpbuttn.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_dc.o: $(srcdir)/src/gtk/dc.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/dc.cpp
+coredll_carbon_button.o: $(srcdir)/src/osx/carbon/button.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/button.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_dc.o: $(srcdir)/src/gtk1/dc.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/dc.cpp
+coredll_carbon_checkbox.o: $(srcdir)/src/osx/carbon/checkbox.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/checkbox.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_dc.o: $(srcdir)/src/msw/dc.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dc.cpp
+coredll_carbon_choice.o: $(srcdir)/src/osx/carbon/choice.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/choice.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_dc.o: $(srcdir)/src/msw/dc.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dc.cpp
+coredll_carbon_colordlg.o: $(srcdir)/src/osx/carbon/colordlg.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/colordlg.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_dc.o: $(srcdir)/src/x11/dc.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/dc.cpp
+coredll_carbon_dialog.o: $(srcdir)/src/osx/carbon/dialog.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dialog.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_dc.o: $(srcdir)/src/mgl/dc.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/dc.cpp
+coredll_carbon_dirdlg.o: $(srcdir)/src/osx/carbon/dirdlg.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dirdlg.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dc.o: $(srcdir)/src/dfb/dc.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/dc.cpp
+coredll_carbon_evtloop.o: $(srcdir)/src/osx/carbon/evtloop.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/evtloop.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_dc.o: $(srcdir)/src/motif/dc.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/dc.cpp
+coredll_carbon_filedlg.o: $(srcdir)/src/osx/carbon/filedlg.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/filedlg.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_dc.o: $(srcdir)/src/cocoa/dc.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/dc.mm
+coredll_carbon_gauge.o: $(srcdir)/src/osx/carbon/gauge.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/gauge.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dc.o: $(srcdir)/src/os2/dc.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dc.cpp
+coredll_carbon_listbox.o: $(srcdir)/src/osx/carbon/listbox.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/listbox.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_dcclient.o: $(srcdir)/src/gtk/dcclient.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/dcclient.cpp
+coredll_listctrl_mac.o: $(srcdir)/src/osx/carbon/listctrl_mac.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/listctrl_mac.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_dcclient.o: $(srcdir)/src/gtk1/dcclient.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/dcclient.cpp
+coredll_carbon_menu.o: $(srcdir)/src/osx/carbon/menu.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/menu.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dcclient.cpp
+coredll_carbon_menuitem.o: $(srcdir)/src/osx/carbon/menuitem.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/menuitem.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dcclient.cpp
+coredll_carbon_msgdlg.o: $(srcdir)/src/osx/carbon/msgdlg.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/msgdlg.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_dcclient.o: $(srcdir)/src/x11/dcclient.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/dcclient.cpp
+coredll_carbon_nonownedwnd.o: $(srcdir)/src/osx/carbon/nonownedwnd.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/nonownedwnd.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/dcclient.cpp
+coredll_notebmac.o: $(srcdir)/src/osx/carbon/notebmac.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/notebmac.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dcclient.o: $(srcdir)/src/dfb/dcclient.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/dcclient.cpp
+coredll_carbon_radiobut.o: $(srcdir)/src/osx/carbon/radiobut.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/radiobut.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_dcclient.o: $(srcdir)/src/motif/dcclient.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/dcclient.cpp
+coredll_carbon_region.o: $(srcdir)/src/osx/carbon/region.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/region.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
+coredll_carbon_scrolbar.o: $(srcdir)/src/osx/carbon/scrolbar.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/scrolbar.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
+coredll_carbon_slider.o: $(srcdir)/src/osx/carbon/slider.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/slider.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_dcclient.o: $(srcdir)/src/cocoa/dcclient.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/dcclient.mm
+coredll_carbon_spinbutt.o: $(srcdir)/src/osx/carbon/spinbutt.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/spinbutt.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dcclient.o: $(srcdir)/src/os2/dcclient.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dcclient.cpp
+coredll_carbon_srchctrl.o: $(srcdir)/src/osx/carbon/srchctrl.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/srchctrl.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_dcmemory.o: $(srcdir)/src/gtk/dcmemory.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/dcmemory.cpp
+coredll_carbon_statbmp.o: $(srcdir)/src/osx/carbon/statbmp.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbmp.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_dcmemory.o: $(srcdir)/src/gtk1/dcmemory.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/dcmemory.cpp
+coredll_carbon_statbox.o: $(srcdir)/src/osx/carbon/statbox.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbox.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp
+coredll_statlmac.o: $(srcdir)/src/osx/carbon/statlmac.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statlmac.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp
+coredll_carbon_stattext.o: $(srcdir)/src/osx/carbon/stattext.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/stattext.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
+coredll_carbon_textctrl.o: $(srcdir)/src/osx/carbon/textctrl.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/textctrl.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
+coredll_carbon_tglbtn.o: $(srcdir)/src/osx/carbon/tglbtn.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/tglbtn.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_dcmemory.o: $(srcdir)/src/x11/dcmemory.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/dcmemory.cpp
+coredll_carbon_toolbar.o: $(srcdir)/src/osx/carbon/toolbar.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/toolbar.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_dcmemory.o: $(srcdir)/src/mgl/dcmemory.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/dcmemory.cpp
+coredll_carbon_tooltip.o: $(srcdir)/src/osx/carbon/tooltip.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/tooltip.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dcmemory.o: $(srcdir)/src/dfb/dcmemory.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/dcmemory.cpp
+coredll_carbon_window.o: $(srcdir)/src/osx/carbon/window.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/window.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_dcmemory.o: $(srcdir)/src/motif/dcmemory.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/dcmemory.cpp
+coredll_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/html/htmlctrl/webkit/webkit.mm
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/dcmemory.mm
+coredll_osx_cocoa_bmpbuttn.o: $(srcdir)/src/osx/cocoa/bmpbuttn.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/bmpbuttn.mm
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dcmemory.cpp
+coredll_osx_cocoa_button.o: $(srcdir)/src/osx/cocoa/button.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/button.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_dcscreen.o: $(srcdir)/src/gtk/dcscreen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/dcscreen.cpp
+coredll_osx_cocoa_checkbox.o: $(srcdir)/src/osx/cocoa/checkbox.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/checkbox.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_dcscreen.o: $(srcdir)/src/gtk1/dcscreen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/dcscreen.cpp
+coredll_osx_cocoa_choice.o: $(srcdir)/src/osx/cocoa/choice.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/choice.mm
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_dcscreen.o: $(srcdir)/src/msw/dcscreen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dcscreen.cpp
+coredll_osx_cocoa_dialog.o: $(srcdir)/src/osx/cocoa/dialog.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/dialog.mm
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_dcscreen.o: $(srcdir)/src/msw/dcscreen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dcscreen.cpp
+coredll_osx_cocoa_dirdlg.o: $(srcdir)/src/osx/cocoa/dirdlg.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/dirdlg.mm
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_dcscreen.o: $(srcdir)/src/x11/dcscreen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/dcscreen.cpp
+coredll_osx_cocoa_evtloop.o: $(srcdir)/src/osx/cocoa/evtloop.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/evtloop.mm
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_dcscreen.o: $(srcdir)/src/mgl/dcscreen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/dcscreen.cpp
+coredll_osx_cocoa_filedlg.o: $(srcdir)/src/osx/cocoa/filedlg.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/filedlg.mm
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dcscreen.o: $(srcdir)/src/dfb/dcscreen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/dcscreen.cpp
+coredll_osx_cocoa_gauge.o: $(srcdir)/src/osx/cocoa/gauge.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/gauge.mm
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_dcscreen.o: $(srcdir)/src/motif/dcscreen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/dcscreen.cpp
+coredll_osx_cocoa_listbox.o: $(srcdir)/src/osx/cocoa/listbox.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/listbox.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
+coredll_osx_cocoa_menu.o: $(srcdir)/src/osx/cocoa/menu.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/menu.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
+coredll_osx_cocoa_menuitem.o: $(srcdir)/src/osx/cocoa/menuitem.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/menuitem.mm
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_dcscreen.o: $(srcdir)/src/cocoa/dcscreen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/dcscreen.cpp
+coredll_osx_cocoa_msgdlg.o: $(srcdir)/src/osx/cocoa/msgdlg.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/msgdlg.mm
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dcscreen.o: $(srcdir)/src/os2/dcscreen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dcscreen.cpp
+coredll_cocoa_nonownedwnd.o: $(srcdir)/src/osx/cocoa/nonownedwnd.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/nonownedwnd.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_dnd.o: $(srcdir)/src/gtk/dnd.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/dnd.cpp
+coredll_osx_cocoa_notebook.o: $(srcdir)/src/osx/cocoa/notebook.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/notebook.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_dnd.o: $(srcdir)/src/gtk1/dnd.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/dnd.cpp
+coredll_osx_cocoa_radiobut.o: $(srcdir)/src/osx/cocoa/radiobut.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/radiobut.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_dnd.o: $(srcdir)/src/osx/carbon/dnd.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dnd.cpp
+coredll_osx_cocoa_scrolbar.o: $(srcdir)/src/osx/cocoa/scrolbar.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/scrolbar.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_dnd.o: $(srcdir)/src/osx/carbon/dnd.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dnd.cpp
+coredll_osx_cocoa_slider.o: $(srcdir)/src/osx/cocoa/slider.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/slider.mm
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dnd.o: $(srcdir)/src/os2/dnd.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dnd.cpp
+coredll_osx_cocoa_spinbutt.o: $(srcdir)/src/osx/cocoa/spinbutt.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/spinbutt.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_filectrl.o: $(srcdir)/src/gtk/filectrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/filectrl.cpp
+coredll_cocoa_srchctrl.o: $(srcdir)/src/osx/cocoa/srchctrl.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/srchctrl.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_font.o: $(srcdir)/src/gtk/font.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/font.cpp
+coredll_osx_cocoa_statbox.o: $(srcdir)/src/osx/cocoa/statbox.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/statbox.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_font.o: $(srcdir)/src/gtk1/font.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/font.cpp
+coredll_cocoa_statline.o: $(srcdir)/src/osx/cocoa/statline.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/statline.mm
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_font.o: $(srcdir)/src/msw/font.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/font.cpp
+coredll_osx_cocoa_stattext.o: $(srcdir)/src/osx/cocoa/stattext.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/stattext.mm
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_font.o: $(srcdir)/src/msw/font.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/font.cpp
+coredll_osx_cocoa_textctrl.o: $(srcdir)/src/osx/cocoa/textctrl.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/textctrl.mm
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_font.o: $(srcdir)/src/x11/font.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/font.cpp
+coredll_cocoa_tglbtn.o: $(srcdir)/src/osx/cocoa/tglbtn.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/tglbtn.mm
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_font.o: $(srcdir)/src/mgl/font.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/font.cpp
+coredll_osx_cocoa_toolbar.o: $(srcdir)/src/osx/cocoa/toolbar.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/toolbar.mm
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_font.o: $(srcdir)/src/dfb/font.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/font.cpp
+coredll_osx_cocoa_tooltip.o: $(srcdir)/src/osx/cocoa/tooltip.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/tooltip.mm
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_font.o: $(srcdir)/src/motif/font.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/font.cpp
+coredll_osx_cocoa_window.o: $(srcdir)/src/osx/cocoa/window.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/window.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_font.o: $(srcdir)/src/osx/carbon/font.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
+coredll_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSBox.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_font.o: $(srcdir)/src/osx/carbon/font.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
+coredll_NSButton.o: $(srcdir)/src/cocoa/NSButton.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSButton.mm
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_font.o: $(srcdir)/src/cocoa/font.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/font.mm
+coredll_NSControl.o: $(srcdir)/src/cocoa/NSControl.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSControl.mm
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_font.o: $(srcdir)/src/os2/font.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/font.cpp
+coredll_NSMenu.o: $(srcdir)/src/cocoa/NSMenu.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSMenu.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/gsockgtk.cpp
+coredll_NSPanel.o: $(srcdir)/src/cocoa/NSPanel.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSPanel.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gsockgtk.o: $(srcdir)/src/gtk1/gsockgtk.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/gsockgtk.cpp
+coredll_NSScroller.o: $(srcdir)/src/cocoa/NSScroller.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSScroller.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_minifram.o: $(srcdir)/src/gtk/minifram.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/minifram.cpp
+coredll_NSSlider.o: $(srcdir)/src/cocoa/NSSlider.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSSlider.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_minifram.o: $(srcdir)/src/gtk1/minifram.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/minifram.cpp
+coredll_NSTabView.o: $(srcdir)/src/cocoa/NSTabView.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSTabView.mm
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_minifram.o: $(srcdir)/src/msw/minifram.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
+coredll_NSTableView.o: $(srcdir)/src/cocoa/NSTableView.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSTableView.mm
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_minifram.o: $(srcdir)/src/msw/minifram.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
+coredll_NSTextField.o: $(srcdir)/src/cocoa/NSTextField.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSTextField.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_minifram.o: $(srcdir)/src/osx/minifram.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
+coredll_NSView.o: $(srcdir)/src/cocoa/NSView.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSView.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_minifram.o: $(srcdir)/src/osx/minifram.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
+coredll_NSWindow.o: $(srcdir)/src/cocoa/NSWindow.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSWindow.mm
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_minifram.o: $(srcdir)/src/x11/minifram.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/minifram.cpp
+coredll_ObjcRef.o: $(srcdir)/src/cocoa/ObjcRef.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/ObjcRef.mm
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_minifram.o: $(srcdir)/src/motif/minifram.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/minifram.cpp
+coredll_cocoa_app.o: $(srcdir)/src/cocoa/app.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/app.mm
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_minifram.o: $(srcdir)/src/os2/minifram.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/minifram.cpp
+coredll_cocoa_bitmap.o: $(srcdir)/src/cocoa/bitmap.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/bitmap.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_pen.o: $(srcdir)/src/gtk/pen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/pen.cpp
+coredll_src_cocoa_bmpbuttn.o: $(srcdir)/src/cocoa/bmpbuttn.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/bmpbuttn.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_pen.o: $(srcdir)/src/gtk1/pen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/pen.cpp
+coredll_cocoa_brush.o: $(srcdir)/src/cocoa/brush.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/brush.mm
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_pen.o: $(srcdir)/src/x11/pen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
+coredll_src_cocoa_button.o: $(srcdir)/src/cocoa/button.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/button.mm
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_pen.o: $(srcdir)/src/x11/pen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
+coredll_src_cocoa_checkbox.o: $(srcdir)/src/cocoa/checkbox.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/checkbox.mm
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_pen.o: $(srcdir)/src/msw/pen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/pen.cpp
+coredll_cocoa_checklst.o: $(srcdir)/src/cocoa/checklst.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/checklst.mm
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_pen.o: $(srcdir)/src/msw/pen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/pen.cpp
+coredll_src_cocoa_choice.o: $(srcdir)/src/cocoa/choice.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/choice.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_pen.o: $(srcdir)/src/osx/pen.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
+coredll_cocoa_clipbrd.o: $(srcdir)/src/cocoa/clipbrd.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/clipbrd.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_pen.o: $(srcdir)/src/osx/pen.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
+coredll_cocoa_colordlg.o: $(srcdir)/src/cocoa/colordlg.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/colordlg.mm
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_pen.o: $(srcdir)/src/mgl/pen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/pen.cpp
+coredll_cocoa_colour.o: $(srcdir)/src/cocoa/colour.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/colour.mm
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_pen.o: $(srcdir)/src/dfb/pen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/pen.cpp
+coredll_cocoa_combobox.o: $(srcdir)/src/cocoa/combobox.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/combobox.mm
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_pen.o: $(srcdir)/src/cocoa/pen.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/pen.mm
+coredll_cocoa_control.o: $(srcdir)/src/cocoa/control.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/control.mm
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_pen.o: $(srcdir)/src/os2/pen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/pen.cpp
+coredll_cocoa_cursor.o: $(srcdir)/src/cocoa/cursor.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/cursor.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_popupwin.o: $(srcdir)/src/gtk/popupwin.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/popupwin.cpp
+coredll_cocoa_data.o: $(srcdir)/src/cocoa/data.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/data.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_popupwin.o: $(srcdir)/src/gtk1/popupwin.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/popupwin.cpp
+coredll_cocoa_dataobj.o: $(srcdir)/src/cocoa/dataobj.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/dataobj.mm
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_popupwin.o: $(srcdir)/src/msw/popupwin.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/popupwin.cpp
+coredll_cocoa_dc.o: $(srcdir)/src/cocoa/dc.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/dc.mm
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_popupwin.o: $(srcdir)/src/msw/popupwin.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/popupwin.cpp
+coredll_cocoa_dcclient.o: $(srcdir)/src/cocoa/dcclient.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/dcclient.mm
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_popupwin.o: $(srcdir)/src/x11/popupwin.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/popupwin.cpp
+coredll_cocoa_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/dcmemory.mm
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_popupwin.o: $(srcdir)/src/motif/popupwin.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/popupwin.cpp
+coredll_cocoa_dcscreen.o: $(srcdir)/src/cocoa/dcscreen.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/dcscreen.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
+coredll_src_cocoa_dialog.o: $(srcdir)/src/cocoa/dialog.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/dialog.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
+coredll_src_cocoa_dirdlg.o: $(srcdir)/src/cocoa/dirdlg.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/dirdlg.mm
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_popupwin.o: $(srcdir)/src/os2/popupwin.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/popupwin.cpp
+coredll_cocoa_display.o: $(srcdir)/src/cocoa/display.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/display.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_private.o: $(srcdir)/src/gtk/private.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/private.cpp
+coredll_drawer.o: $(srcdir)/src/cocoa/drawer.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/drawer.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_region.o: $(srcdir)/src/gtk/region.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/region.cpp
+coredll_src_cocoa_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/evtloop.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_region.o: $(srcdir)/src/gtk1/region.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/region.cpp
+coredll_src_cocoa_filedlg.o: $(srcdir)/src/cocoa/filedlg.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/filedlg.mm
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_region.o: $(srcdir)/src/x11/region.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/region.cpp
+coredll_cocoa_font.o: $(srcdir)/src/cocoa/font.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/font.mm
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_region.o: $(srcdir)/src/x11/region.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/region.cpp
+coredll_cocoa_fontdlg.o: $(srcdir)/src/cocoa/fontdlg.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/fontdlg.mm
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_region.o: $(srcdir)/src/msw/region.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/region.cpp
+coredll_cocoa_fontenum.o: $(srcdir)/src/cocoa/fontenum.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/fontenum.mm
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_region.o: $(srcdir)/src/msw/region.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/region.cpp
+coredll_cocoa_fontutil.o: $(srcdir)/src/cocoa/fontutil.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/fontutil.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_region.o: $(srcdir)/src/mgl/region.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/region.cpp
+coredll_cocoa_frame.o: $(srcdir)/src/cocoa/frame.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/frame.mm
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_region.o: $(srcdir)/src/dfb/region.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/region.cpp
+coredll_src_cocoa_gauge.o: $(srcdir)/src/cocoa/gauge.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/gauge.mm
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_region.o: $(srcdir)/src/osx/carbon/region.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/region.cpp
+coredll_cocoa_icon.o: $(srcdir)/src/cocoa/icon.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/icon.mm
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_region.o: $(srcdir)/src/cocoa/region.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/region.mm
+coredll_src_cocoa_listbox.o: $(srcdir)/src/cocoa/listbox.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/listbox.mm
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_region.o: $(srcdir)/src/os2/region.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/region.cpp
+coredll_cocoa_main.o: $(srcdir)/src/cocoa/main.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/main.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_renderer.o: $(srcdir)/src/gtk/renderer.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/renderer.cpp
+coredll_mbarman.o: $(srcdir)/src/cocoa/mbarman.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/mbarman.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_renderer.o: $(srcdir)/src/gtk1/renderer.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/renderer.cpp
+coredll_cocoa_mdi.o: $(srcdir)/src/cocoa/mdi.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/mdi.mm
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_renderer.o: $(srcdir)/src/msw/renderer.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/renderer.cpp
+coredll_src_cocoa_menu.o: $(srcdir)/src/cocoa/menu.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/menu.mm
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_renderer.o: $(srcdir)/src/msw/renderer.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/renderer.cpp
+coredll_src_cocoa_menuitem.o: $(srcdir)/src/cocoa/menuitem.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/menuitem.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
+coredll_src_cocoa_msgdlg.o: $(srcdir)/src/cocoa/msgdlg.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/msgdlg.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
+coredll_src_cocoa_notebook.o: $(srcdir)/src/cocoa/notebook.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/notebook.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_settings.o: $(srcdir)/src/gtk/settings.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/settings.cpp
+coredll_cocoa_pen.o: $(srcdir)/src/cocoa/pen.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/pen.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_settings.o: $(srcdir)/src/gtk1/settings.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/settings.cpp
+coredll_cocoa_radiobox.o: $(srcdir)/src/cocoa/radiobox.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/radiobox.mm
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_settings.o: $(srcdir)/src/msw/settings.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/settings.cpp
+coredll_src_cocoa_radiobut.o: $(srcdir)/src/cocoa/radiobut.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/radiobut.mm
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_settings.o: $(srcdir)/src/msw/settings.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/settings.cpp
+coredll_cocoa_region.o: $(srcdir)/src/cocoa/region.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/region.mm
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_settings.o: $(srcdir)/src/x11/settings.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/settings.cpp
+coredll_src_cocoa_scrolbar.o: $(srcdir)/src/cocoa/scrolbar.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/scrolbar.mm
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_settings.o: $(srcdir)/src/mgl/settings.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/settings.cpp
+coredll_cocoa_settings.o: $(srcdir)/src/cocoa/settings.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/settings.mm
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_settings.o: $(srcdir)/src/dfb/settings.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/settings.cpp
+coredll_src_cocoa_slider.o: $(srcdir)/src/cocoa/slider.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/slider.mm
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_settings.o: $(srcdir)/src/motif/settings.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/settings.cpp
+coredll_sound.o: $(srcdir)/src/cocoa/sound.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/sound.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
+coredll_src_cocoa_spinbutt.o: $(srcdir)/src/cocoa/spinbutt.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/spinbutt.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
+coredll_cocoa_statbmp.o: $(srcdir)/src/cocoa/statbmp.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/statbmp.mm
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_settings.o: $(srcdir)/src/cocoa/settings.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/settings.mm
+coredll_src_cocoa_statbox.o: $(srcdir)/src/cocoa/statbox.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/statbox.mm
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_settings.o: $(srcdir)/src/os2/settings.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/settings.cpp
+coredll_statline2.o: $(srcdir)/src/cocoa/statline2.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/statline2.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_timer.o: $(srcdir)/src/gtk/timer.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/timer.cpp
+coredll_src_cocoa_stattext.o: $(srcdir)/src/cocoa/stattext.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/stattext.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_timer.o: $(srcdir)/src/gtk1/timer.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/timer.cpp
+coredll_src_cocoa_textctrl.o: $(srcdir)/src/cocoa/textctrl.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/textctrl.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_timer.o: $(srcdir)/src/osx/core/timer.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
+coredll_cocoa_timer.o: $(srcdir)/src/cocoa/timer.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/timer.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_timer.o: $(srcdir)/src/osx/core/timer.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
+coredll_src_cocoa_toolbar.o: $(srcdir)/src/cocoa/toolbar.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/toolbar.mm
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_timer.o: $(srcdir)/src/generic/timer.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
+coredll_src_cocoa_tooltip.o: $(srcdir)/src/cocoa/tooltip.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/tooltip.mm
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_timer.o: $(srcdir)/src/generic/timer.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
+coredll_cocoa_toplevel.o: $(srcdir)/src/cocoa/toplevel.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/toplevel.mm
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_timer.o: $(srcdir)/src/generic/timer.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
+coredll_src_cocoa_utils.o: $(srcdir)/src/cocoa/utils.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/utils.mm
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_timer.o: $(srcdir)/src/motif/timer.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/timer.cpp
+coredll_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/utilsexc.mm
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_timer.o: $(srcdir)/src/cocoa/timer.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/timer.mm
+coredll_src_cocoa_window.o: $(srcdir)/src/cocoa/window.mm $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/window.mm
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_timer.o: $(srcdir)/src/os2/timer.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/timer.cpp
+coredll_os2_accel.o: $(srcdir)/src/os2/accel.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/accel.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_tooltip.o: $(srcdir)/src/gtk/tooltip.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/tooltip.cpp
+coredll_os2_app.o: $(srcdir)/src/os2/app.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/app.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_tooltip.o: $(srcdir)/src/gtk1/tooltip.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/tooltip.cpp
+coredll_os2_bitmap.o: $(srcdir)/src/os2/bitmap.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/bitmap.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp
+coredll_os2_bmpbuttn.o: $(srcdir)/src/os2/bmpbuttn.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/bmpbuttn.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp
+coredll_os2_brush.o: $(srcdir)/src/os2/brush.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/brush.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_tooltip.o: $(srcdir)/src/osx/carbon/tooltip.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/tooltip.cpp
+coredll_os2_button.o: $(srcdir)/src/os2/button.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/button.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_tooltip.o: $(srcdir)/src/osx/cocoa/tooltip.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/tooltip.mm
+coredll_os2_checkbox.o: $(srcdir)/src/os2/checkbox.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/checkbox.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_tooltip.o: $(srcdir)/src/cocoa/tooltip.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/tooltip.mm
+coredll_os2_checklst.o: $(srcdir)/src/os2/checklst.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/checklst.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_tooltip.o: $(srcdir)/src/os2/tooltip.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/tooltip.cpp
+coredll_os2_choice.o: $(srcdir)/src/os2/choice.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/choice.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_toplevel.o: $(srcdir)/src/gtk/toplevel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/toplevel.cpp
+coredll_os2_clipbrd.o: $(srcdir)/src/os2/clipbrd.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/clipbrd.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_toplevel.o: $(srcdir)/src/gtk1/toplevel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/toplevel.cpp
+coredll_os2_colour.o: $(srcdir)/src/os2/colour.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/colour.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
+coredll_os2_combobox.o: $(srcdir)/src/os2/combobox.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/combobox.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
+coredll_os2_control.o: $(srcdir)/src/os2/control.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/control.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_toplevel.o: $(srcdir)/src/x11/toplevel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/toplevel.cpp
+coredll_os2_cursor.o: $(srcdir)/src/os2/cursor.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/cursor.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_toplevel.o: $(srcdir)/src/mgl/toplevel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/toplevel.cpp
+coredll_os2_data.o: $(srcdir)/src/os2/data.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/data.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_toplevel.o: $(srcdir)/src/dfb/toplevel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/toplevel.cpp
+coredll_os2_dataobj.o: $(srcdir)/src/os2/dataobj.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dataobj.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_toplevel.o: $(srcdir)/src/motif/toplevel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/toplevel.cpp
+coredll_os2_dc.o: $(srcdir)/src/os2/dc.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dc.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_toplevel.o: $(srcdir)/src/cocoa/toplevel.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/toplevel.mm
+coredll_os2_dcclient.o: $(srcdir)/src/os2/dcclient.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dcclient.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_toplevel.o: $(srcdir)/src/os2/toplevel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/toplevel.cpp
+coredll_os2_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dcmemory.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_utilsgtk.o: $(srcdir)/src/gtk/utilsgtk.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/utilsgtk.cpp
+coredll_os2_dcprint.o: $(srcdir)/src/os2/dcprint.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dcprint.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_utilsgtk.o: $(srcdir)/src/gtk1/utilsgtk.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/utilsgtk.cpp
+coredll_os2_dcscreen.o: $(srcdir)/src/os2/dcscreen.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dcscreen.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_win_gtk.o: $(srcdir)/src/gtk/win_gtk.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/win_gtk.cpp
+coredll_os2_dialog.o: $(srcdir)/src/os2/dialog.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dialog.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_win_gtk.o: $(srcdir)/src/gtk1/win_gtk.c $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CCC) -c -o $@ $(COREDLL_CFLAGS) $(srcdir)/src/gtk1/win_gtk.c
+coredll_os2_dnd.o: $(srcdir)/src/os2/dnd.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dnd.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_window.o: $(srcdir)/src/gtk/window.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/window.cpp
+coredll_os2_evtloop.o: $(srcdir)/src/os2/evtloop.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/evtloop.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_window.o: $(srcdir)/src/gtk1/window.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/window.cpp
+coredll_os2_filedlg.o: $(srcdir)/src/os2/filedlg.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/filedlg.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_window.o: $(srcdir)/src/msw/window.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/window.cpp
+coredll_os2_font.o: $(srcdir)/src/os2/font.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/font.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_window.o: $(srcdir)/src/msw/window.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/window.cpp
+coredll_os2_fontdlg.o: $(srcdir)/src/os2/fontdlg.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/fontdlg.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_window.o: $(srcdir)/src/x11/window.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/window.cpp
+coredll_os2_fontenum.o: $(srcdir)/src/os2/fontenum.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/fontenum.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_window.o: $(srcdir)/src/mgl/window.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/window.cpp
+coredll_os2_fontutil.o: $(srcdir)/src/os2/fontutil.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/fontutil.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_window.o: $(srcdir)/src/dfb/window.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/window.cpp
+coredll_os2_frame.o: $(srcdir)/src/os2/frame.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/frame.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_window.o: $(srcdir)/src/motif/window.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/window.cpp
+coredll_os2_gauge.o: $(srcdir)/src/os2/gauge.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/gauge.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_window.o: $(srcdir)/src/osx/carbon/window.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/window.cpp
+coredll_os2_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/gdiimage.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_window.o: $(srcdir)/src/osx/cocoa/window.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/window.mm
+coredll_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/gsockpm.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_window.o: $(srcdir)/src/cocoa/window.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/window.mm
+coredll_os2_helpwin.o: $(srcdir)/src/os2/helpwin.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/helpwin.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_window.o: $(srcdir)/src/os2/window.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/window.cpp
+coredll_os2_icon.o: $(srcdir)/src/os2/icon.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/icon.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_data.o: $(srcdir)/src/gtk1/data.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/data.cpp
+coredll_os2_iniconf.o: $(srcdir)/src/os2/iniconf.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/iniconf.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_data.o: $(srcdir)/src/msw/data.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/data.cpp
+coredll_os2_listbox.o: $(srcdir)/src/os2/listbox.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/listbox.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_data.o: $(srcdir)/src/msw/data.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/data.cpp
+coredll_os2_main.o: $(srcdir)/src/os2/main.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/main.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_data.o: $(srcdir)/src/x11/data.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/data.cpp
+coredll_os2_menu.o: $(srcdir)/src/os2/menu.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/menu.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_data.o: $(srcdir)/src/mgl/data.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/data.cpp
+coredll_os2_menuitem.o: $(srcdir)/src/os2/menuitem.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/menuitem.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_data.o: $(srcdir)/src/motif/data.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/data.cpp
+coredll_os2_metafile.o: $(srcdir)/src/os2/metafile.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/metafile.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_data.o: $(srcdir)/src/cocoa/data.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/data.cpp
+coredll_os2_minifram.o: $(srcdir)/src/os2/minifram.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/minifram.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_data.o: $(srcdir)/src/os2/data.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/data.cpp
+coredll_os2_msgdlg.o: $(srcdir)/src/os2/msgdlg.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/msgdlg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_palette.o: $(srcdir)/src/x11/palette.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
+coredll_os2_nativdlg.o: $(srcdir)/src/os2/nativdlg.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/nativdlg.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_palette.o: $(srcdir)/src/x11/palette.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
+coredll_os2_notebook.o: $(srcdir)/src/os2/notebook.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/notebook.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_palette.o: $(srcdir)/src/msw/palette.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/palette.cpp
+coredll_os2_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/ownerdrw.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_palette.o: $(srcdir)/src/msw/palette.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/palette.cpp
+coredll_os2_palette.o: $(srcdir)/src/os2/palette.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/palette.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_palette.o: $(srcdir)/src/osx/palette.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
+coredll_os2_pen.o: $(srcdir)/src/os2/pen.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/pen.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_palette.o: $(srcdir)/src/osx/palette.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
+coredll_os2_popupwin.o: $(srcdir)/src/os2/popupwin.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/popupwin.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_palette.o: $(srcdir)/src/mgl/palette.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/palette.cpp
+coredll_os2_print.o: $(srcdir)/src/os2/print.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/print.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_palette.o: $(srcdir)/src/os2/palette.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/palette.cpp
+coredll_os2_radiobox.o: $(srcdir)/src/os2/radiobox.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/radiobox.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
+coredll_os2_radiobut.o: $(srcdir)/src/os2/radiobut.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/radiobut.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
+coredll_os2_region.o: $(srcdir)/src/os2/region.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/region.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_dcprint.o: $(srcdir)/src/msw/dcprint.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dcprint.cpp
+coredll_os2_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/scrolbar.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_dcprint.o: $(srcdir)/src/msw/dcprint.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dcprint.cpp
+coredll_os2_settings.o: $(srcdir)/src/os2/settings.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/settings.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
+coredll_os2_slider.o: $(srcdir)/src/os2/slider.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/slider.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
+coredll_os2_spinbutt.o: $(srcdir)/src/os2/spinbutt.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/spinbutt.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dcprint.o: $(srcdir)/src/os2/dcprint.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dcprint.cpp
+coredll_os2_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/spinctrl.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_dib.o: $(srcdir)/src/msw/dib.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dib.cpp
+coredll_os2_statbmp.o: $(srcdir)/src/os2/statbmp.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/statbmp.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_dib.o: $(srcdir)/src/msw/dib.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dib.cpp
+coredll_os2_statbox.o: $(srcdir)/src/os2/statbox.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/statbox.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_display.o: $(srcdir)/src/msw/display.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/display.cpp
+coredll_os2_statline.o: $(srcdir)/src/os2/statline.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/statline.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_display.o: $(srcdir)/src/msw/display.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/display.cpp
+coredll_os2_stattext.o: $(srcdir)/src/os2/stattext.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/stattext.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_display.o: $(srcdir)/src/osx/core/display.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
+coredll_os2_tabctrl.o: $(srcdir)/src/os2/tabctrl.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/tabctrl.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_display.o: $(srcdir)/src/osx/core/display.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
+coredll_os2_textctrl.o: $(srcdir)/src/os2/textctrl.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/textctrl.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_display.o: $(srcdir)/src/cocoa/display.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/display.mm
+coredll_os2_textentry.o: $(srcdir)/src/os2/textentry.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/textentry.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp
+coredll_os2_tglbtn.o: $(srcdir)/src/os2/tglbtn.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/tglbtn.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp
+coredll_os2_timer.o: $(srcdir)/src/os2/timer.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/timer.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp
+coredll_os2_toolbar.o: $(srcdir)/src/os2/toolbar.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/toolbar.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp
+coredll_os2_tooltip.o: $(srcdir)/src/os2/tooltip.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/tooltip.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/gdiimage.cpp
+coredll_os2_toplevel.o: $(srcdir)/src/os2/toplevel.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/toplevel.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp
+coredll_os2_utilsgui.o: $(srcdir)/src/os2/utilsgui.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/utilsgui.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp
+coredll_os2_window.o: $(srcdir)/src/os2/window.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/window.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
+coredll_univ_bmpbuttn.o: $(srcdir)/src/univ/bmpbuttn.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/bmpbuttn.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
+coredll_univ_button.o: $(srcdir)/src/univ/button.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/button.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp
+coredll_univ_checkbox.o: $(srcdir)/src/univ/checkbox.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/checkbox.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp
+coredll_univ_checklst.o: $(srcdir)/src/univ/checklst.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/checklst.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_graphics.o: $(srcdir)/src/msw/graphics.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp
+coredll_univ_choice.o: $(srcdir)/src/univ/choice.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/choice.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_graphics.o: $(srcdir)/src/msw/graphics.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp
+coredll_univ_combobox.o: $(srcdir)/src/univ/combobox.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/combobox.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
+coredll_univ_control.o: $(srcdir)/src/univ/control.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/control.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
+coredll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/ctrlrend.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/dropsrc.cpp
+coredll_univ_dialog.o: $(srcdir)/src/univ/dialog.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/dialog.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/dropsrc.cpp
+coredll_framuniv.o: $(srcdir)/src/univ/framuniv.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/framuniv.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_droptgt.o: $(srcdir)/src/msw/ole/droptgt.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/droptgt.cpp
+coredll_univ_gauge.o: $(srcdir)/src/univ/gauge.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/gauge.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_droptgt.o: $(srcdir)/src/msw/ole/droptgt.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/droptgt.cpp
+coredll_inpcons.o: $(srcdir)/src/univ/inpcons.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/inpcons.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp
+coredll_inphand.o: $(srcdir)/src/univ/inphand.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/inphand.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp
+coredll_univ_listbox.o: $(srcdir)/src/univ/listbox.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/listbox.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_printdlg.o: $(srcdir)/src/msw/printdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/printdlg.cpp
+coredll_univ_menu.o: $(srcdir)/src/univ/menu.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/menu.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_printdlg.o: $(srcdir)/src/msw/printdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/printdlg.cpp
+coredll_univ_notebook.o: $(srcdir)/src/univ/notebook.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/notebook.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_printdlg.o: $(srcdir)/src/osx/carbon/printdlg.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/printdlg.cpp
+coredll_univ_radiobox.o: $(srcdir)/src/univ/radiobox.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/radiobox.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_printdlg.o: $(srcdir)/src/osx/carbon/printdlg.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/printdlg.cpp
+coredll_univ_radiobut.o: $(srcdir)/src/univ/radiobut.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/radiobut.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_printwin.o: $(srcdir)/src/msw/printwin.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/printwin.cpp
+coredll_scrarrow.o: $(srcdir)/src/univ/scrarrow.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/scrarrow.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_printwin.o: $(srcdir)/src/msw/printwin.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/printwin.cpp
+coredll_univ_scrolbar.o: $(srcdir)/src/univ/scrolbar.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/scrolbar.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp
+coredll_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/scrthumb.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp
+coredll_settingsuniv.o: $(srcdir)/src/univ/settingsuniv.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/settingsuniv.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_utilsgui.o: $(srcdir)/src/os2/utilsgui.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/utilsgui.cpp
+coredll_univ_slider.o: $(srcdir)/src/univ/slider.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/slider.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/uxtheme.cpp
+coredll_univ_spinbutt.o: $(srcdir)/src/univ/spinbutt.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/spinbutt.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/uxtheme.cpp
+coredll_univ_statbmp.o: $(srcdir)/src/univ/statbmp.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/statbmp.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_helpchm.o: $(srcdir)/src/msw/helpchm.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/helpchm.cpp
+coredll_univ_statbox.o: $(srcdir)/src/univ/statbox.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/statbox.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_helpwin.o: $(srcdir)/src/msw/helpwin.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/helpwin.cpp
+coredll_univ_statline.o: $(srcdir)/src/univ/statline.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/statline.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_helpwin.o: $(srcdir)/src/os2/helpwin.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/helpwin.cpp
+coredll_univ_stattext.o: $(srcdir)/src/univ/stattext.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/stattext.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/automtn.cpp
+coredll_univ_statusbr.o: $(srcdir)/src/univ/statusbr.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/statusbr.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/uuid.cpp
+coredll_stdrend.o: $(srcdir)/src/univ/stdrend.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/stdrend.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_accel.o: $(srcdir)/src/osx/accel.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/accel.cpp
+coredll_univ_textctrl.o: $(srcdir)/src/univ/textctrl.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/textctrl.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_accel.o: $(srcdir)/src/osx/accel.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/accel.cpp
+coredll_univ_tglbtn.o: $(srcdir)/src/univ/tglbtn.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/tglbtn.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+coredll_theme.o: $(srcdir)/src/univ/theme.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/theme.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+coredll_univ_toolbar.o: $(srcdir)/src/univ/toolbar.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/toolbar.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+coredll_topluniv.o: $(srcdir)/src/univ/topluniv.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/topluniv.cpp
-@COND_USE_GUI_1_WXUNIV_1@coredll_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+coredll_winuniv.o: $(srcdir)/src/univ/winuniv.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/winuniv.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/motif/accel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/accel.cpp
+coredll_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/themes/gtk.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/msw/accel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
+coredll_metal.o: $(srcdir)/src/univ/themes/metal.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/themes/metal.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/msw/accel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
+coredll_mono.o: $(srcdir)/src/univ/themes/mono.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/themes/mono.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/os2/accel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/accel.cpp
+coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/themes/win32.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_artmac.o: $(srcdir)/src/osx/artmac.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_artmac.o: $(srcdir)/src/osx/artmac.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_tabctrl_osx.o: $(srcdir)/src/osx/tabctrl_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/tabctrl_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_app.o: $(srcdir)/src/gtk/app.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/app.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_tabctrl_osx.o: $(srcdir)/src/osx/tabctrl_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/tabctrl_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.c $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CCC) -c -o $@ $(COREDLL_CFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.c
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/bitmap.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_brush.o: $(srcdir)/src/gtk/brush.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/brush.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_clipbrd.o: $(srcdir)/src/gtk/clipbrd.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/clipbrd.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_colour.o: $(srcdir)/src/gtk/colour.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/colour.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_cursor.o: $(srcdir)/src/gtk/cursor.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/cursor.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_dataobj.o: $(srcdir)/src/gtk/dataobj.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/dataobj.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_dc.o: $(srcdir)/src/gtk/dc.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/dc.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_dcclient.o: $(srcdir)/src/gtk/dcclient.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/dcclient.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_dcmemory.o: $(srcdir)/src/gtk/dcmemory.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/dcmemory.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_dcscreen.o: $(srcdir)/src/gtk/dcscreen.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/dcscreen.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_dnd.o: $(srcdir)/src/gtk/dnd.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/dnd.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/evtloop.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_hid.o: $(srcdir)/src/osx/core/hid.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_filectrl.o: $(srcdir)/src/gtk/filectrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/filectrl.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_hid.o: $(srcdir)/src/osx/core/hid.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_font.o: $(srcdir)/src/gtk/font.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/font.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@coredll_hid.o: $(srcdir)/src/osx/core/hid.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/gsockgtk.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_minifram.o: $(srcdir)/src/gtk/minifram.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/minifram.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_pen.o: $(srcdir)/src/gtk/pen.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/pen.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_popupwin.o: $(srcdir)/src/gtk/popupwin.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/popupwin.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_private.o: $(srcdir)/src/gtk/private.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/private.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@coredll_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_region.o: $(srcdir)/src/gtk/region.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/region.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_nanox.o: $(srcdir)/src/x11/nanox.c $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(COREDLL_CFLAGS) $(srcdir)/src/x11/nanox.c
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_renderer.o: $(srcdir)/src/gtk/renderer.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/renderer.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_reparent.o: $(srcdir)/src/x11/reparent.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/reparent.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_settings.o: $(srcdir)/src/gtk/settings.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/settings.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_timer.o: $(srcdir)/src/gtk/timer.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/timer.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_tooltip.o: $(srcdir)/src/gtk/tooltip.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/tooltip.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mask.o: $(srcdir)/src/generic/mask.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_toplevel.o: $(srcdir)/src/gtk/toplevel.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/toplevel.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_mask.o: $(srcdir)/src/generic/mask.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_utilsgtk.o: $(srcdir)/src/gtk/utilsgtk.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/utilsgtk.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_dirmgl.o: $(srcdir)/src/mgl/dirmgl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/dirmgl.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_win_gtk.o: $(srcdir)/src/gtk/win_gtk.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/win_gtk.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_fontmgr.o: $(srcdir)/src/mgl/fontmgr.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/fontmgr.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_window.o: $(srcdir)/src/gtk/window.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/window.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_fontmgr.o: $(srcdir)/src/dfb/fontmgr.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/fontmgr.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_app.o: $(srcdir)/src/gtk1/app.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/app.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_nonownedwnd.o: $(srcdir)/src/dfb/nonownedwnd.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/nonownedwnd.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_bitmap.o: $(srcdir)/src/gtk1/bitmap.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/bitmap.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_nonownedwnd.o: $(srcdir)/src/osx/carbon/nonownedwnd.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/nonownedwnd.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_brush.o: $(srcdir)/src/gtk1/brush.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/brush.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_nonownedwnd.o: $(srcdir)/src/osx/cocoa/nonownedwnd.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/nonownedwnd.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_clipbrd.o: $(srcdir)/src/gtk1/clipbrd.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/clipbrd.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_overlay.o: $(srcdir)/src/dfb/overlay.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/overlay.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_colour.o: $(srcdir)/src/gtk1/colour.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/colour.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_cursor.o: $(srcdir)/src/gtk1/cursor.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/cursor.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_data.o: $(srcdir)/src/gtk1/data.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/data.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_wrapdfb.o: $(srcdir)/src/dfb/wrapdfb.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/wrapdfb.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_dataobj.o: $(srcdir)/src/gtk1/dataobj.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/dataobj.cpp
-@COND_PLATFORM_UNIX_1_USE_GUI_1@coredll_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_UNIX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_dc.o: $(srcdir)/src/gtk1/dc.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/dc.cpp
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@coredll_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_dcclient.o: $(srcdir)/src/gtk1/dcclient.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/dcclient.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_dcmemory.o: $(srcdir)/src/gtk1/dcmemory.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/dcmemory.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_dcscreen.o: $(srcdir)/src/gtk1/dcscreen.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/dcscreen.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_dnd.o: $(srcdir)/src/gtk1/dnd.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/dnd.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_evtloop.o: $(srcdir)/src/gtk1/evtloop.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/evtloop.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_font.o: $(srcdir)/src/gtk1/font.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/font.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_gsockgtk.o: $(srcdir)/src/gtk1/gsockgtk.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/gsockgtk.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_main.o: $(srcdir)/src/gtk1/main.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/main.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_minifram.o: $(srcdir)/src/gtk1/minifram.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/minifram.cpp
-@COND_USE_GUI_1_WXUNIV_1@coredll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_pen.o: $(srcdir)/src/gtk1/pen.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/pen.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_fdrepdlg.o: $(srcdir)/src/msw/fdrepdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/fdrepdlg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_popupwin.o: $(srcdir)/src/gtk1/popupwin.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/popupwin.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_region.o: $(srcdir)/src/gtk1/region.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/region.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_renderer.o: $(srcdir)/src/gtk1/renderer.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/renderer.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_settings.o: $(srcdir)/src/gtk1/settings.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/settings.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_timer.o: $(srcdir)/src/gtk1/timer.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/timer.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_tooltip.o: $(srcdir)/src/gtk1/tooltip.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/tooltip.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_toplevel.o: $(srcdir)/src/gtk1/toplevel.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/toplevel.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_utilsgtk.o: $(srcdir)/src/gtk1/utilsgtk.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/utilsgtk.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_win_gtk.o: $(srcdir)/src/gtk1/win_gtk.c $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CCC) -c -o $@ $(COREDLL_CFLAGS) $(srcdir)/src/gtk1/win_gtk.c
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_window.o: $(srcdir)/src/gtk1/window.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/window.cpp
-@COND_USE_GUI_1_WXUNIV_1@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_x11_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_x11_brush.o: $(srcdir)/src/x11/brush.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_brush.o: $(srcdir)/src/x11/brush.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_x11_palette.o: $(srcdir)/src/x11/palette.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_palette.o: $(srcdir)/src/x11/palette.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_x11_pen.o: $(srcdir)/src/x11/pen.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_pen.o: $(srcdir)/src/x11/pen.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_x11_region.o: $(srcdir)/src/x11/region.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/region.cpp
-@COND_USE_GUI_1_WXUNIV_1@coredll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_region.o: $(srcdir)/src/x11/region.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/region.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_listctrl.o: $(srcdir)/src/msw/listctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/listctrl.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_listctrl.o: $(srcdir)/src/msw/listctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/listctrl.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_app.o: $(srcdir)/src/msw/app.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/app.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_app.o: $(srcdir)/src/msw/app.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/app.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_brush.o: $(srcdir)/src/msw/brush.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/brush.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_brush.o: $(srcdir)/src/msw/brush.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/brush.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_caret.o: $(srcdir)/src/msw/caret.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/caret.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_caret.o: $(srcdir)/src/msw/caret.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/caret.cpp
-@COND_USE_GUI_1_WXUNIV_1@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/clipbrd.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/clipbrd.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_colour.o: $(srcdir)/src/msw/colour.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/colour.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_colour.o: $(srcdir)/src/msw/colour.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/colour.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_cursor.o: $(srcdir)/src/msw/cursor.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/cursor.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_cursor.o: $(srcdir)/src/msw/cursor.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/cursor.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_data.o: $(srcdir)/src/msw/data.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/data.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_data.o: $(srcdir)/src/msw/data.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/data.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_dc.o: $(srcdir)/src/msw/dc.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dc.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_dc.o: $(srcdir)/src/msw/dc.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dc.cpp
-@COND_USE_GUI_1_WXUNIV_1@coredll_statusbr.o: $(srcdir)/src/univ/statusbr.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/statusbr.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dcclient.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dcclient.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_dcprint.o: $(srcdir)/src/msw/dcprint.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dcprint.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_dcprint.o: $(srcdir)/src/msw/dcprint.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dcprint.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_dcscreen.o: $(srcdir)/src/msw/dcscreen.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dcscreen.cpp
-@COND_USE_GUI_1_WXUNIV_1@coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_dcscreen.o: $(srcdir)/src/msw/dcscreen.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dcscreen.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_dialup.o: $(srcdir)/src/msw/dialup.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_dialup.o: $(srcdir)/src/msw/dialup.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_dib.o: $(srcdir)/src/msw/dib.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dib.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_dib.o: $(srcdir)/src/msw/dib.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dib.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_display.o: $(srcdir)/src/msw/display.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/display.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_display.o: $(srcdir)/src/msw/display.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/display.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp
-@COND_USE_GUI_1_WXUNIV_1@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_font.o: $(srcdir)/src/msw/font.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/font.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_font.o: $(srcdir)/src/msw/font.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/font.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp
-@COND_USE_GUI_1_WXUNIV_1@coredll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_bmpbuttn.o: $(srcdir)/src/gtk/bmpbuttn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/bmpbuttn.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_bmpbuttn.o: $(srcdir)/src/gtk1/bmpbuttn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/bmpbuttn.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_bmpbuttn.o: $(srcdir)/src/motif/bmpbuttn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/bmpbuttn.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_bmpbuttn.o: $(srcdir)/src/osx/carbon/bmpbuttn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/bmpbuttn.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_bmpbuttn.o: $(srcdir)/src/osx/cocoa/bmpbuttn.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/bmpbuttn.mm
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_bmpbuttn.o: $(srcdir)/src/cocoa/bmpbuttn.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/bmpbuttn.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_bmpbuttn.o: $(srcdir)/src/os2/bmpbuttn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/bmpbuttn.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_graphics.o: $(srcdir)/src/msw/graphics.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp
-@COND_USE_GUI_1_WXUNIV_1@coredll_bmpbuttn.o: $(srcdir)/src/univ/bmpbuttn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/bmpbuttn.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_graphics.o: $(srcdir)/src/msw/graphics.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_button.o: $(srcdir)/src/gtk/button.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/button.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_icon.o: $(srcdir)/src/msw/icon.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_button.o: $(srcdir)/src/gtk1/button.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/button.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_icon.o: $(srcdir)/src/msw/icon.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_button.o: $(srcdir)/src/motif/button.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/button.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_button.o: $(srcdir)/src/msw/button.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/button.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_button.o: $(srcdir)/src/msw/button.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/button.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_minifram.o: $(srcdir)/src/msw/minifram.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_button.o: $(srcdir)/src/osx/carbon/button.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/button.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_minifram.o: $(srcdir)/src/msw/minifram.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_button.o: $(srcdir)/src/osx/cocoa/button.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/button.mm
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_ole_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/dataobj.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_button.o: $(srcdir)/src/cocoa/button.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/button.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_ole_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/dataobj.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_button.o: $(srcdir)/src/os2/button.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/button.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/dropsrc.cpp
-@COND_USE_GUI_1_WXUNIV_1@coredll_button.o: $(srcdir)/src/univ/button.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/button.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/dropsrc.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_checkbox.o: $(srcdir)/src/gtk/checkbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/checkbox.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_droptgt.o: $(srcdir)/src/msw/ole/droptgt.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/droptgt.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_checkbox.o: $(srcdir)/src/gtk1/checkbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/checkbox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_droptgt.o: $(srcdir)/src/msw/ole/droptgt.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/droptgt.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_checkbox.o: $(srcdir)/src/motif/checkbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/checkbox.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/checkbox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/checkbox.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_palette.o: $(srcdir)/src/msw/palette.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/palette.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_checkbox.o: $(srcdir)/src/osx/carbon/checkbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/checkbox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_palette.o: $(srcdir)/src/msw/palette.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/palette.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_checkbox.o: $(srcdir)/src/osx/cocoa/checkbox.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/checkbox.mm
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_pen.o: $(srcdir)/src/msw/pen.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/pen.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_checkbox.o: $(srcdir)/src/cocoa/checkbox.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/checkbox.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_pen.o: $(srcdir)/src/msw/pen.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/pen.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_checkbox.o: $(srcdir)/src/os2/checkbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/checkbox.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_popupwin.o: $(srcdir)/src/msw/popupwin.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/popupwin.cpp
-@COND_USE_GUI_1_WXUNIV_1@coredll_checkbox.o: $(srcdir)/src/univ/checkbox.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/checkbox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_popupwin.o: $(srcdir)/src/msw/popupwin.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/popupwin.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_checklst.o: $(srcdir)/src/gtk/checklst.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/checklst.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_printdlg.o: $(srcdir)/src/msw/printdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/printdlg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_checklst.o: $(srcdir)/src/gtk1/checklst.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/checklst.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_printdlg.o: $(srcdir)/src/msw/printdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/printdlg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_checklst.o: $(srcdir)/src/motif/checklst.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/checklst.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_printwin.o: $(srcdir)/src/msw/printwin.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/printwin.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_checklst.o: $(srcdir)/src/msw/checklst.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_printwin.o: $(srcdir)/src/msw/printwin.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/printwin.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_checklst.o: $(srcdir)/src/msw/wince/checklst.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/wince/checklst.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_region.o: $(srcdir)/src/msw/region.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/region.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_checklst.o: $(srcdir)/src/cocoa/checklst.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/checklst.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_region.o: $(srcdir)/src/msw/region.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/region.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_checklst.o: $(srcdir)/src/os2/checklst.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/checklst.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_renderer.o: $(srcdir)/src/msw/renderer.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/renderer.cpp
-@COND_USE_GUI_1_WXUNIV_1@coredll_checklst.o: $(srcdir)/src/univ/checklst.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/checklst.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_renderer.o: $(srcdir)/src/msw/renderer.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/renderer.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_choice.o: $(srcdir)/src/gtk/choice.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/choice.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_settings.o: $(srcdir)/src/msw/settings.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/settings.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_choice.o: $(srcdir)/src/gtk1/choice.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/choice.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_settings.o: $(srcdir)/src/msw/settings.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/settings.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_choice.o: $(srcdir)/src/motif/choice.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/choice.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_choice.o: $(srcdir)/src/msw/choice.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/choice.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_choice.o: $(srcdir)/src/msw/choice.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/choice.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_choice.o: $(srcdir)/src/osx/carbon/choice.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/choice.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_choice.o: $(srcdir)/src/osx/cocoa/choice.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/choice.mm
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_choice.o: $(srcdir)/src/cocoa/choice.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/choice.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_choice.o: $(srcdir)/src/os2/choice.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/choice.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/uxtheme.cpp
-@COND_USE_GUI_1_WXUNIV_1@coredll_choice.o: $(srcdir)/src/univ/choice.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/choice.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/uxtheme.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_colordlg.o: $(srcdir)/src/gtk/colordlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/colordlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_window.o: $(srcdir)/src/msw/window.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/window.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/colordlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_window.o: $(srcdir)/src/msw/window.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/window.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/colordlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_helpchm.o: $(srcdir)/src/msw/helpchm.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/helpchm.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_colordlg.o: $(srcdir)/src/osx/carbon/colordlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/colordlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_helpwin.o: $(srcdir)/src/msw/helpwin.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/helpwin.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_colordlg.o: $(srcdir)/src/cocoa/colordlg.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/colordlg.mm
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/automtn.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_combobox.o: $(srcdir)/src/gtk/combobox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/combobox.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/uuid.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_combobox.o: $(srcdir)/src/gtk1/combobox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_osx_accel.o: $(srcdir)/src/osx/accel.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/accel.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_combobox.o: $(srcdir)/src/motif/combobox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_osx_accel.o: $(srcdir)/src/osx/accel.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/accel.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_combobox.o: $(srcdir)/src/msw/combobox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_artmac.o: $(srcdir)/src/osx/artmac.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_combobox.o: $(srcdir)/src/msw/combobox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_artmac.o: $(srcdir)/src/osx/artmac.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_combobox.o: $(srcdir)/src/cocoa/combobox.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/combobox.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_osx_brush.o: $(srcdir)/src/osx/brush.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_combobox.o: $(srcdir)/src/os2/combobox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_osx_brush.o: $(srcdir)/src/osx/brush.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
-@COND_USE_GUI_1_WXUNIV_1@coredll_combobox.o: $(srcdir)/src/univ/combobox.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_control.o: $(srcdir)/src/gtk/control.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_control.o: $(srcdir)/src/gtk1/control.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_control.o: $(srcdir)/src/motif/control.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_control.o: $(srcdir)/src/msw/control.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_control.o: $(srcdir)/src/msw/control.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_control.o: $(srcdir)/src/osx/carbon/control.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_control.o: $(srcdir)/src/osx/carbon/control.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_control.o: $(srcdir)/src/cocoa/control.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/control.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_control.o: $(srcdir)/src/os2/control.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
-@COND_USE_GUI_1_WXUNIV_1@coredll_control.o: $(srcdir)/src/univ/control.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_osx_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_dialog.o: $(srcdir)/src/gtk/dialog.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/dialog.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_osx_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_dialog.o: $(srcdir)/src/gtk1/dialog.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/dialog.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_dialog.o: $(srcdir)/src/motif/dialog.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/dialog.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_dialog.o: $(srcdir)/src/msw/dialog.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dialog.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_osx_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_dialog.o: $(srcdir)/src/msw/dialog.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dialog.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_osx_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_dialog.o: $(srcdir)/src/osx/carbon/dialog.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dialog.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_dialog.o: $(srcdir)/src/osx/cocoa/dialog.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/dialog.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_dialog.o: $(srcdir)/src/cocoa/dialog.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/dialog.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dialog.o: $(srcdir)/src/os2/dialog.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dialog.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp
-@COND_USE_GUI_1_WXUNIV_1@coredll_dialog.o: $(srcdir)/src/univ/dialog.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/dialog.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_dirdlg.o: $(srcdir)/src/gtk/dirdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/dirdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_dirdlg.o: $(srcdir)/src/msw/dirdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dirdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_osx_minifram.o: $(srcdir)/src/osx/minifram.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_dirdlg.o: $(srcdir)/src/msw/dirdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dirdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_osx_minifram.o: $(srcdir)/src/osx/minifram.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_dirdlg.o: $(srcdir)/src/osx/carbon/dirdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dirdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_dirdlg.o: $(srcdir)/src/osx/cocoa/dirdlg.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/dirdlg.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_dirdlg.o: $(srcdir)/src/cocoa/dirdlg.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/dirdlg.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/gtk/filedlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/filedlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/gtk1/filedlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/filedlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_osx_palette.o: $(srcdir)/src/osx/palette.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/motif/filedlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/filedlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_osx_palette.o: $(srcdir)/src/osx/palette.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_osx_pen.o: $(srcdir)/src/osx/pen.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_osx_pen.o: $(srcdir)/src/osx/pen.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/osx/carbon/filedlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/filedlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/osx/cocoa/filedlg.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/filedlg.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/cocoa/filedlg.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/filedlg.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/os2/filedlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/filedlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_fontdlg.o: $(srcdir)/src/gtk/fontdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/fontdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_fontdlg.o: $(srcdir)/src/gtk1/fontdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/fontdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_fontdlg.o: $(srcdir)/src/msw/fontdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/fontdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontdlg.o: $(srcdir)/src/cocoa/fontdlg.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/fontdlg.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_fontdlg.o: $(srcdir)/src/os2/fontdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/fontdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_frame.o: $(srcdir)/src/gtk/frame.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/frame.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_frame.o: $(srcdir)/src/gtk1/frame.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/frame.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_frame.o: $(srcdir)/src/motif/frame.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/frame.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_frame.o: $(srcdir)/src/msw/frame.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/frame.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_frame.o: $(srcdir)/src/msw/frame.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/frame.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_frame.o: $(srcdir)/src/cocoa/frame.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/frame.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_frame.o: $(srcdir)/src/os2/frame.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/frame.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/gtk/gauge.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/gauge.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_tabctrl_osx.o: $(srcdir)/src/osx/tabctrl_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/tabctrl_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/gtk1/gauge.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/gauge.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_tabctrl_osx.o: $(srcdir)/src/osx/tabctrl_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/tabctrl_osx.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/motif/gauge.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/gauge.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/msw/gauge.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/msw/gauge.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/osx/carbon/gauge.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/gauge.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/osx/cocoa/gauge.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/gauge.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/cocoa/gauge.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/gauge.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/os2/gauge.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/gauge.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp
-@COND_USE_GUI_1_WXUNIV_1@coredll_gauge.o: $(srcdir)/src/univ/gauge.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/gauge.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_print.o: $(srcdir)/src/gtk/print.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/print.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_print.o: $(srcdir)/src/os2/print.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/print.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_listbox.o: $(srcdir)/src/gtk/listbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/listbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_listbox.o: $(srcdir)/src/gtk1/listbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/listbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_listbox.o: $(srcdir)/src/motif/listbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/listbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_core_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_listbox.o: $(srcdir)/src/msw/listbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/listbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_core_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_listbox.o: $(srcdir)/src/msw/listbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/listbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_core_colour.o: $(srcdir)/src/osx/core/colour.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_listbox.o: $(srcdir)/src/osx/carbon/listbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/listbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_core_colour.o: $(srcdir)/src/osx/core/colour.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_listbox.o: $(srcdir)/src/osx/cocoa/listbox.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/listbox.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_core_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_listbox.o: $(srcdir)/src/cocoa/listbox.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/listbox.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_core_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_listbox.o: $(srcdir)/src/os2/listbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/listbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_core_display.o: $(srcdir)/src/osx/core/display.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
-@COND_USE_GUI_1_WXUNIV_1@coredll_listbox.o: $(srcdir)/src/univ/listbox.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/listbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_core_display.o: $(srcdir)/src/osx/core/display.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_mdi.o: $(srcdir)/src/gtk/mdi.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/mdi.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_core_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_mdi.o: $(srcdir)/src/gtk1/mdi.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/mdi.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_core_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_mdi.o: $(srcdir)/src/motif/mdi.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/mdi.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_hid.o: $(srcdir)/src/osx/core/hid.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_mdi.o: $(srcdir)/src/msw/mdi.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/mdi.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_hid.o: $(srcdir)/src/osx/core/hid.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_mdi.o: $(srcdir)/src/msw/mdi.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/mdi.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1@coredll_hid.o: $(srcdir)/src/osx/core/hid.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_mdi.o: $(srcdir)/src/osx/carbon/mdi.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/mdi.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_mdi.o: $(srcdir)/src/osx/carbon/mdi.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/mdi.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_mdi.o: $(srcdir)/src/cocoa/mdi.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/mdi.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_core_timer.o: $(srcdir)/src/osx/core/timer.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_menu.o: $(srcdir)/src/gtk/menu.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/menu.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_core_timer.o: $(srcdir)/src/osx/core/timer.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_menu.o: $(srcdir)/src/gtk1/menu.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/menu.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_menu.o: $(srcdir)/src/motif/menu.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/menu.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_menu.o: $(srcdir)/src/msw/menu.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/menu.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1@coredll_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_menu.o: $(srcdir)/src/msw/menu.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/menu.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_generic_timer.o: $(srcdir)/src/generic/timer.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_menu.o: $(srcdir)/src/osx/carbon/menu.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/menu.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_generic_timer.o: $(srcdir)/src/generic/timer.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_menu.o: $(srcdir)/src/osx/cocoa/menu.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/menu.mm
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_generic_timer.o: $(srcdir)/src/generic/timer.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_menu.o: $(srcdir)/src/cocoa/menu.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/menu.mm
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_app.o: $(srcdir)/src/x11/app.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/app.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_menu.o: $(srcdir)/src/os2/menu.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/menu.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_clipbrd.o: $(srcdir)/src/x11/clipbrd.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/clipbrd.cpp
-@COND_USE_GUI_1_WXUNIV_1@coredll_menu.o: $(srcdir)/src/univ/menu.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/menu.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_colour.o: $(srcdir)/src/x11/colour.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/colour.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_msgdlg.o: $(srcdir)/src/gtk/msgdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/msgdlg.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_cursor.o: $(srcdir)/src/x11/cursor.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/cursor.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_msgdlg.o: $(srcdir)/src/motif/msgdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/msgdlg.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_data.o: $(srcdir)/src/x11/data.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/data.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/msgdlg.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_dataobj.o: $(srcdir)/src/x11/dataobj.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/dataobj.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/msgdlg.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_dc.o: $(srcdir)/src/x11/dc.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/dc.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_msgdlg.o: $(srcdir)/src/osx/carbon/msgdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/msgdlg.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_dcclient.o: $(srcdir)/src/x11/dcclient.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/dcclient.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_msgdlg.o: $(srcdir)/src/osx/cocoa/msgdlg.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/msgdlg.mm
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_dcmemory.o: $(srcdir)/src/x11/dcmemory.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/dcmemory.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_msgdlg.o: $(srcdir)/src/cocoa/msgdlg.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/msgdlg.mm
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_dcscreen.o: $(srcdir)/src/x11/dcscreen.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/dcscreen.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_msgdlg.o: $(srcdir)/src/os2/msgdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/msgdlg.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_evtloop.o: $(srcdir)/src/x11/evtloop.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/evtloop.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_nativewin.o: $(srcdir)/src/gtk/nativewin.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/nativewin.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_font.o: $(srcdir)/src/x11/font.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/font.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/nativewin.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_minifram.o: $(srcdir)/src/x11/minifram.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/minifram.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/nativewin.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_nanox.o: $(srcdir)/src/x11/nanox.c $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(COREDLL_CFLAGS) $(srcdir)/src/x11/nanox.c
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_notebook.o: $(srcdir)/src/gtk/notebook.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/notebook.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_popupwin.o: $(srcdir)/src/x11/popupwin.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/popupwin.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_notebook.o: $(srcdir)/src/gtk1/notebook.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/notebook.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_reparent.o: $(srcdir)/src/x11/reparent.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/reparent.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_notebook.o: $(srcdir)/src/generic/notebook.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/notebook.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_settings.o: $(srcdir)/src/x11/settings.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/settings.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_notebook.o: $(srcdir)/src/msw/notebook.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/notebook.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_toplevel.o: $(srcdir)/src/x11/toplevel.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/toplevel.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_notebook.o: $(srcdir)/src/msw/notebook.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/notebook.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_utils.o: $(srcdir)/src/x11/utils.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/utils.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_notebook.o: $(srcdir)/src/osx/cocoa/notebook.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/notebook.mm
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_window.o: $(srcdir)/src/x11/window.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/window.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_notebook.o: $(srcdir)/src/cocoa/notebook.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/notebook.mm
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_notebook.o: $(srcdir)/src/os2/notebook.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/notebook.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
-@COND_USE_GUI_1_WXUNIV_1@coredll_notebook.o: $(srcdir)/src/univ/notebook.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/notebook.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_generic_colour.o: $(srcdir)/src/generic/colour.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_radiobox.o: $(srcdir)/src/gtk/radiobox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/radiobox.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_generic_colour.o: $(srcdir)/src/generic/colour.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_radiobox.o: $(srcdir)/src/gtk1/radiobox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/radiobox.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mask.o: $(srcdir)/src/generic/mask.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_radiobox.o: $(srcdir)/src/motif/radiobox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/radiobox.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_mask.o: $(srcdir)/src/generic/mask.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/radiobox.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_app.o: $(srcdir)/src/mgl/app.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/app.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/radiobox.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_bitmap.o: $(srcdir)/src/mgl/bitmap.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/bitmap.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_radiobox.o: $(srcdir)/src/cocoa/radiobox.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/radiobox.mm
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_brush.o: $(srcdir)/src/mgl/brush.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/brush.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_radiobox.o: $(srcdir)/src/os2/radiobox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/radiobox.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_clipbrd.o: $(srcdir)/src/mgl/clipbrd.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/clipbrd.cpp
-@COND_USE_GUI_1_WXUNIV_1@coredll_radiobox.o: $(srcdir)/src/univ/radiobox.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/radiobox.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_cursor.o: $(srcdir)/src/mgl/cursor.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/cursor.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_radiobut.o: $(srcdir)/src/gtk/radiobut.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/radiobut.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_data.o: $(srcdir)/src/mgl/data.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/data.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_radiobut.o: $(srcdir)/src/gtk1/radiobut.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/radiobut.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_dc.o: $(srcdir)/src/mgl/dc.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/dc.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_radiobut.o: $(srcdir)/src/motif/radiobut.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/radiobut.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/dcclient.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/radiobut.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_dcmemory.o: $(srcdir)/src/mgl/dcmemory.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/dcmemory.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/radiobut.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_dcscreen.o: $(srcdir)/src/mgl/dcscreen.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/dcscreen.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_radiobut.o: $(srcdir)/src/osx/carbon/radiobut.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/radiobut.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_dirmgl.o: $(srcdir)/src/mgl/dirmgl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/dirmgl.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_radiobut.o: $(srcdir)/src/osx/cocoa/radiobut.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/radiobut.mm
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/evtloop.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_radiobut.o: $(srcdir)/src/cocoa/radiobut.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/radiobut.mm
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_font.o: $(srcdir)/src/mgl/font.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/font.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_radiobut.o: $(srcdir)/src/os2/radiobut.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/radiobut.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_fontenum.o: $(srcdir)/src/mgl/fontenum.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/fontenum.cpp
-@COND_USE_GUI_1_WXUNIV_1@coredll_radiobut.o: $(srcdir)/src/univ/radiobut.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/radiobut.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_fontmgr.o: $(srcdir)/src/mgl/fontmgr.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/fontmgr.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_scrolbar.o: $(srcdir)/src/gtk/scrolbar.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/scrolbar.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_fontutil.o: $(srcdir)/src/mgl/fontutil.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/fontutil.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_scrolbar.o: $(srcdir)/src/gtk1/scrolbar.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/scrolbar.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_palette.o: $(srcdir)/src/mgl/palette.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/palette.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_scrolbar.o: $(srcdir)/src/motif/scrolbar.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/scrolbar.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_pen.o: $(srcdir)/src/mgl/pen.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/pen.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_region.o: $(srcdir)/src/mgl/region.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/region.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_settings.o: $(srcdir)/src/mgl/settings.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/settings.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_scrolbar.o: $(srcdir)/src/osx/carbon/scrolbar.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/scrolbar.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_toplevel.o: $(srcdir)/src/mgl/toplevel.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/toplevel.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_scrolbar.o: $(srcdir)/src/osx/cocoa/scrolbar.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/scrolbar.mm
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_utils.o: $(srcdir)/src/mgl/utils.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/utils.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_scrolbar.o: $(srcdir)/src/cocoa/scrolbar.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/scrolbar.mm
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_window.o: $(srcdir)/src/mgl/window.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/window.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/scrolbar.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_app.o: $(srcdir)/src/dfb/app.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/app.cpp
-@COND_USE_GUI_1_WXUNIV_1@coredll_scrolbar.o: $(srcdir)/src/univ/scrolbar.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/scrolbar.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_bitmap.o: $(srcdir)/src/dfb/bitmap.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/bitmap.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_scrolwin.o: $(srcdir)/src/gtk/scrolwin.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/scrolwin.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_brush.o: $(srcdir)/src/dfb/brush.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/brush.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_scrolwin.o: $(srcdir)/src/gtk1/scrolwin.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/scrolwin.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_cursor.o: $(srcdir)/src/dfb/cursor.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/cursor.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/gtk/slider.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/slider.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_dc.o: $(srcdir)/src/dfb/dc.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/dc.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/gtk1/slider.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/slider.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_dcclient.o: $(srcdir)/src/dfb/dcclient.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/dcclient.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/motif/slider.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/slider.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_dcmemory.o: $(srcdir)/src/dfb/dcmemory.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/dcmemory.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/msw/slider.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_dcscreen.o: $(srcdir)/src/dfb/dcscreen.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/dcscreen.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/msw/slider.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_evtloop.o: $(srcdir)/src/dfb/evtloop.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/evtloop.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/osx/carbon/slider.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/slider.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_font.o: $(srcdir)/src/dfb/font.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/font.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/osx/cocoa/slider.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/slider.mm
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_fontenum.o: $(srcdir)/src/dfb/fontenum.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/fontenum.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/cocoa/slider.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/slider.mm
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_fontmgr.o: $(srcdir)/src/dfb/fontmgr.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/fontmgr.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/os2/slider.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/slider.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_nonownedwnd.o: $(srcdir)/src/dfb/nonownedwnd.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/nonownedwnd.cpp
-@COND_USE_GUI_1_WXUNIV_1@coredll_slider.o: $(srcdir)/src/univ/slider.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/slider.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_overlay.o: $(srcdir)/src/dfb/overlay.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/overlay.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_spinbutt.o: $(srcdir)/src/gtk/spinbutt.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/spinbutt.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_pen.o: $(srcdir)/src/dfb/pen.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/pen.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_spinbutt.o: $(srcdir)/src/gtk1/spinbutt.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/spinbutt.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_region.o: $(srcdir)/src/dfb/region.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/region.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_spinbutt.o: $(srcdir)/src/motif/spinbutt.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/spinbutt.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_settings.o: $(srcdir)/src/dfb/settings.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/settings.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/spinbutt.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_toplevel.o: $(srcdir)/src/dfb/toplevel.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/toplevel.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/spinbutt.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_utils.o: $(srcdir)/src/dfb/utils.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/utils.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_spinbutt.o: $(srcdir)/src/osx/carbon/spinbutt.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/spinbutt.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_window.o: $(srcdir)/src/dfb/window.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/window.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_spinbutt.o: $(srcdir)/src/osx/cocoa/spinbutt.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/spinbutt.mm
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_wrapdfb.o: $(srcdir)/src/dfb/wrapdfb.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/wrapdfb.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_spinbutt.o: $(srcdir)/src/cocoa/spinbutt.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/spinbutt.mm
+@COND_PLATFORM_UNIX_1_USE_GUI_1@coredll_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_UNIX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_spinbutt.o: $(srcdir)/src/os2/spinbutt.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/spinbutt.cpp
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@coredll_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
-@COND_USE_GUI_1_WXUNIV_1@coredll_spinbutt.o: $(srcdir)/src/univ/spinbutt.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/spinbutt.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_spinctrl.o: $(srcdir)/src/gtk/spinctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/spinctrl.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_spinctrl.o: $(srcdir)/src/gtk1/spinctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/spinctrl.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp
+@COND_USE_GUI_1_WXUNIV_1@coredll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/spinctrl.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_statbmp.o: $(srcdir)/src/gtk/statbmp.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/statbmp.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_statbmp.o: $(srcdir)/src/gtk1/statbmp.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/statbmp.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_statbmp.o: $(srcdir)/src/motif/statbmp.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/statbmp.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statbmp.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statbmp.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_statbmp.o: $(srcdir)/src/osx/carbon/statbmp.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbmp.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_statbmp.o: $(srcdir)/src/cocoa/statbmp.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/statbmp.mm
+@COND_USE_GUI_1_WXUNIV_1@coredll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_statbmp.o: $(srcdir)/src/os2/statbmp.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/statbmp.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_USE_GUI_1_WXUNIV_1@coredll_statbmp.o: $(srcdir)/src/univ/statbmp.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/statbmp.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_statbox.o: $(srcdir)/src/gtk/statbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/statbox.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_statbox.o: $(srcdir)/src/gtk1/statbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/statbox.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_statbox.o: $(srcdir)/src/motif/statbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/statbox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_statbox.o: $(srcdir)/src/msw/statbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_statbox.o: $(srcdir)/src/msw/statbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_statbox.o: $(srcdir)/src/osx/carbon/statbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbox.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_statbox.o: $(srcdir)/src/osx/cocoa/statbox.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/statbox.mm
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_statbox.o: $(srcdir)/src/cocoa/statbox.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/statbox.mm
+@COND_USE_GUI_1_WXUNIV_1@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_statbox.o: $(srcdir)/src/os2/statbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/statbox.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_USE_GUI_1_WXUNIV_1@coredll_statbox.o: $(srcdir)/src/univ/statbox.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/statbox.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_statline.o: $(srcdir)/src/gtk/statline.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/statline.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_statline.o: $(srcdir)/src/gtk1/statline.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/statline.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_statline.o: $(srcdir)/src/generic/statline.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statline.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_statline.o: $(srcdir)/src/msw/statline.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statline.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_statline.o: $(srcdir)/src/msw/statline.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statline.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_statline.o: $(srcdir)/src/osx/cocoa/statline.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/statline.mm
+@COND_USE_GUI_1_WXUNIV_1@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_statline.o: $(srcdir)/src/os2/statline.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/statline.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-@COND_USE_GUI_1_WXUNIV_1@coredll_statline.o: $(srcdir)/src/univ/statline.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/statline.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_stattext.o: $(srcdir)/src/gtk/stattext.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/stattext.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_stattext.o: $(srcdir)/src/gtk1/stattext.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/stattext.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_stattext.o: $(srcdir)/src/motif/stattext.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/stattext.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_stattext.o: $(srcdir)/src/msw/stattext.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_stattext.o: $(srcdir)/src/msw/stattext.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_stattext.o: $(srcdir)/src/osx/carbon/stattext.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/stattext.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_stattext.o: $(srcdir)/src/osx/cocoa/stattext.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/stattext.mm
+@COND_USE_GUI_1_WXUNIV_1@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_stattext.o: $(srcdir)/src/cocoa/stattext.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/stattext.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_stattext.o: $(srcdir)/src/os2/stattext.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/stattext.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_USE_GUI_1_WXUNIV_1@coredll_stattext.o: $(srcdir)/src/univ/stattext.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/stattext.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/tbargtk.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_tbargtk.o: $(srcdir)/src/gtk1/tbargtk.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/tbargtk.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/textctrl.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_textctrl.o: $(srcdir)/src/gtk1/textctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/textctrl.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_textctrl.o: $(srcdir)/src/motif/textctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/textctrl.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/textctrl.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/textctrl.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_textctrl.o: $(srcdir)/src/osx/carbon/textctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/textctrl.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_textctrl.o: $(srcdir)/src/osx/cocoa/textctrl.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/textctrl.mm
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_textctrl.o: $(srcdir)/src/cocoa/textctrl.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/textctrl.mm
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_textctrl.o: $(srcdir)/src/os2/textctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/textctrl.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-@COND_USE_GUI_1_WXUNIV_1@coredll_textctrl.o: $(srcdir)/src/univ/textctrl.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/textctrl.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_textentry.o: $(srcdir)/src/gtk/textentry.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/textentry.cpp
+@COND_USE_GUI_1_WXUNIV_1@coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_textentry.o: $(srcdir)/src/motif/textentry.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/textentry.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_textentry.o: $(srcdir)/src/msw/textentry.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_textentry.o: $(srcdir)/src/msw/textentry.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_textentry.o: $(srcdir)/src/os2/textentry.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/textentry.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_tglbtn.o: $(srcdir)/src/gtk/tglbtn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/tglbtn.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_tglbtn.o: $(srcdir)/src/gtk1/tglbtn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/tglbtn.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/tglbtn.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/tglbtn.cpp
+@COND_USE_GUI_1_WXUNIV_1@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_tglbtn.o: $(srcdir)/src/osx/carbon/tglbtn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/tglbtn.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_tglbtn.o: $(srcdir)/src/osx/cocoa/tglbtn.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/tglbtn.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_tglbtn.o: $(srcdir)/src/os2/tglbtn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/tglbtn.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
-@COND_USE_GUI_1_WXUNIV_1@coredll_tglbtn.o: $(srcdir)/src/univ/tglbtn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/tglbtn.cpp
+@COND_USE_GUI_1_WXUNIV_1@coredll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
@@ -27350,50 +27162,41 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1_WXUNIV_1@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/menuitem.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_menuitem.o: $(srcdir)/src/msw/menuitem.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/menuitem.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_menuitem.o: $(srcdir)/src/msw/menuitem.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/menuitem.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_menuitem.o: $(srcdir)/src/osx/carbon/menuitem.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/menuitem.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_menuitem.o: $(srcdir)/src/osx/cocoa/menuitem.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/menuitem.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_menuitem.o: $(srcdir)/src/cocoa/menuitem.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/menuitem.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_menuitem.o: $(srcdir)/src/os2/menuitem.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/menuitem.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_toolbar.o: $(srcdir)/src/motif/toolbar.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/toolbar.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_button.o: $(srcdir)/src/msw/button.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/button.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_button.o: $(srcdir)/src/msw/button.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/button.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/checkbox.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_toolbar.o: $(srcdir)/src/osx/carbon/toolbar.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/toolbar.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/checkbox.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_toolbar.o: $(srcdir)/src/osx/cocoa/toolbar.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/toolbar.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_choice.o: $(srcdir)/src/msw/choice.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/choice.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_toolbar.o: $(srcdir)/src/cocoa/toolbar.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/toolbar.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_choice.o: $(srcdir)/src/msw/choice.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/choice.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_toolbar.o: $(srcdir)/src/os2/toolbar.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/toolbar.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/colordlg.cpp
-@COND_USE_GUI_1_WXUNIV_1@coredll_toolbar.o: $(srcdir)/src/univ/toolbar.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/toolbar.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/colordlg.cpp
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_combo.o: $(srcdir)/src/msw/combo.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/combo.cpp
@@ -27401,3335 +27204,3338 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_combo.o: $(srcdir)/src/msw/combo.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/combo.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_combobox.o: $(srcdir)/src/msw/combobox.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/combobox.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_combobox.o: $(srcdir)/src/msw/combobox.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/combobox.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_control.o: $(srcdir)/src/msw/control.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/control.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_control.o: $(srcdir)/src/msw/control.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/control.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_iniconf.o: $(srcdir)/src/os2/iniconf.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/iniconf.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_dialog.o: $(srcdir)/src/msw/dialog.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dialog.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_metafile.o: $(srcdir)/src/msw/metafile.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/metafile.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_dialog.o: $(srcdir)/src/msw/dialog.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dialog.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_metafile.o: $(srcdir)/src/msw/metafile.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/metafile.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_dirdlg.o: $(srcdir)/src/msw/dirdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dirdlg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_dirdlg.o: $(srcdir)/src/msw/dirdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dirdlg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_metafile.o: $(srcdir)/src/os2/metafile.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/metafile.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_nativdlg.o: $(srcdir)/src/os2/nativdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/nativdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_frame.o: $(srcdir)/src/msw/frame.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/frame.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_access.o: $(srcdir)/src/msw/ole/access.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_frame.o: $(srcdir)/src/msw/frame.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/frame.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_access.o: $(srcdir)/src/msw/ole/access.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_gauge.o: $(srcdir)/src/msw/gauge.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_gauge.o: $(srcdir)/src/msw/gauge.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/ownerdrw.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_listbox.o: $(srcdir)/src/msw/listbox.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/listbox.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_listbox.o: $(srcdir)/src/msw/listbox.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/listbox.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/tabctrl.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_listctrl.o: $(srcdir)/src/msw/listctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/listctrl.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/tabctrl.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_listctrl.o: $(srcdir)/src/msw/listctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/listctrl.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_tabctrl.o: $(srcdir)/src/osx/carbon/tabctrl.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/tabctrl.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_mdi.o: $(srcdir)/src/msw/mdi.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/mdi.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_tabctrl.o: $(srcdir)/src/osx/carbon/tabctrl.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/tabctrl.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_mdi.o: $(srcdir)/src/msw/mdi.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/mdi.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_tabctrl.o: $(srcdir)/src/os2/tabctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/tabctrl.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_menu.o: $(srcdir)/src/msw/menu.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/menu.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_menu.o: $(srcdir)/src/msw/menu.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/menu.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_menuitem.o: $(srcdir)/src/msw/menuitem.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/menuitem.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_menuitem.o: $(srcdir)/src/msw/menuitem.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/menuitem.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_metafile.o: $(srcdir)/src/msw/metafile.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/metafile.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_metafile.o: $(srcdir)/src/msw/metafile.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/metafile.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/msgdlg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_glgrab.o: $(srcdir)/src/osx/core/glgrab.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/glgrab.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/msgdlg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_glgrab.o: $(srcdir)/src/osx/core/glgrab.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/glgrab.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/nativewin.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/nativewin.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_notebook.o: $(srcdir)/src/msw/notebook.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/notebook.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_srchctrl.o: $(srcdir)/src/osx/carbon/srchctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/srchctrl.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_notebook.o: $(srcdir)/src/msw/notebook.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/notebook.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_srchctrl.o: $(srcdir)/src/osx/cocoa/srchctrl.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/srchctrl.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_access.o: $(srcdir)/src/msw/ole/access.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_regiong.o: $(srcdir)/src/generic/regiong.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_access.o: $(srcdir)/src/msw/ole/access.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_regiong.o: $(srcdir)/src/generic/regiong.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp
-@COND_USE_GUI_1_WXUNIV_1@coredll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/radiobox.cpp
-@COND_USE_GUI_1@coredll_accelcmn.o: $(srcdir)/src/common/accelcmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/accelcmn.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/radiobox.cpp
-@COND_USE_GUI_1@coredll_accesscmn.o: $(srcdir)/src/common/accesscmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/accesscmn.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/radiobut.cpp
-@COND_USE_GUI_1@coredll_anidecod.o: $(srcdir)/src/common/anidecod.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/anidecod.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/radiobut.cpp
-@COND_USE_GUI_1@coredll_appcmn.o: $(srcdir)/src/common/appcmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/appcmn.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp
-@COND_USE_GUI_1@coredll_artprov.o: $(srcdir)/src/common/artprov.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/artprov.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp
-@COND_USE_GUI_1@coredll_artstd.o: $(srcdir)/src/common/artstd.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/artstd.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_slider.o: $(srcdir)/src/msw/slider.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
-@COND_USE_GUI_1@coredll_bmpbase.o: $(srcdir)/src/common/bmpbase.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/bmpbase.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_slider.o: $(srcdir)/src/msw/slider.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
-@COND_USE_GUI_1@coredll_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/bookctrl.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/spinbutt.cpp
-@COND_USE_GUI_1@coredll_btncmn.o: $(srcdir)/src/common/btncmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/btncmn.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/spinbutt.cpp
-@COND_USE_GUI_1@coredll_cairo.o: $(srcdir)/src/common/cairo.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/cairo.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp
-@COND_USE_GUI_1@coredll_choiccmn.o: $(srcdir)/src/common/choiccmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/choiccmn.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp
-@COND_USE_GUI_1@coredll_clipcmn.o: $(srcdir)/src/common/clipcmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/clipcmn.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statbmp.cpp
-@COND_USE_GUI_1@coredll_clrpickercmn.o: $(srcdir)/src/common/clrpickercmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/clrpickercmn.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statbmp.cpp
-@COND_USE_GUI_1@coredll_colourcmn.o: $(srcdir)/src/common/colourcmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/colourcmn.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_statbox.o: $(srcdir)/src/msw/statbox.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_statbox.o: $(srcdir)/src/msw/statbox.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
-@COND_USE_GUI_1@coredll_combocmn.o: $(srcdir)/src/common/combocmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/combocmn.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
-@COND_USE_GUI_1@coredll_cmdproc.o: $(srcdir)/src/common/cmdproc.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/cmdproc.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
-@COND_USE_GUI_1@coredll_cmndata.o: $(srcdir)/src/common/cmndata.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/cmndata.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_statline.o: $(srcdir)/src/msw/statline.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statline.cpp
-@COND_USE_GUI_1@coredll_containr.o: $(srcdir)/src/common/containr.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/containr.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_statline.o: $(srcdir)/src/msw/statline.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statline.cpp
-@COND_USE_GUI_1@coredll_cshelp.o: $(srcdir)/src/common/cshelp.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/cshelp.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_stattext.o: $(srcdir)/src/msw/stattext.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
-@COND_USE_GUI_1@coredll_ctrlcmn.o: $(srcdir)/src/common/ctrlcmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/ctrlcmn.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_stattext.o: $(srcdir)/src/msw/stattext.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
-@COND_USE_GUI_1@coredll_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/ctrlsub.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/tabctrl.cpp
-@COND_USE_GUI_1@coredll_datacmn.o: $(srcdir)/src/common/datacmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/datacmn.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/tabctrl.cpp
-@COND_USE_GUI_1@coredll_dcbase.o: $(srcdir)/src/common/dcbase.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dcbase.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
-@COND_USE_GUI_1@coredll_dcbufcmn.o: $(srcdir)/src/common/dcbufcmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dcbufcmn.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
-@COND_USE_GUI_1@coredll_dcgraph.o: $(srcdir)/src/common/dcgraph.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dcgraph.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/textctrl.cpp
-@COND_USE_GUI_1@coredll_dcsvg.o: $(srcdir)/src/common/dcsvg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dcsvg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/textctrl.cpp
-@COND_USE_GUI_1@coredll_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dlgcmn.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_textentry.o: $(srcdir)/src/msw/textentry.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp
-@COND_USE_GUI_1@coredll_dndcmn.o: $(srcdir)/src/common/dndcmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dndcmn.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_textentry.o: $(srcdir)/src/msw/textentry.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp
-@COND_USE_GUI_1@coredll_dobjcmn.o: $(srcdir)/src/common/dobjcmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dobjcmn.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/tglbtn.cpp
-@COND_USE_GUI_1@coredll_docmdi.o: $(srcdir)/src/common/docmdi.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/docmdi.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/tglbtn.cpp
-@COND_USE_GUI_1@coredll_docview.o: $(srcdir)/src/common/docview.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/docview.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp
-@COND_USE_GUI_1@coredll_dpycmn.o: $(srcdir)/src/common/dpycmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dpycmn.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp
-@COND_USE_GUI_1@coredll_dseldlg.o: $(srcdir)/src/common/dseldlg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dseldlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
-@COND_USE_GUI_1@coredll_effects.o: $(srcdir)/src/common/effects.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/effects.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
-@COND_USE_GUI_1@coredll_fddlgcmn.o: $(srcdir)/src/common/fddlgcmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fddlgcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
-@COND_USE_GUI_1@coredll_filectrlcmn.o: $(srcdir)/src/common/filectrlcmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/filectrlcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
-@COND_USE_GUI_1@coredll_filepickercmn.o: $(srcdir)/src/common/filepickercmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/filepickercmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
-@COND_USE_GUI_1@coredll_fontpickercmn.o: $(srcdir)/src/common/fontpickercmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontpickercmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
-@COND_USE_GUI_1@coredll_fldlgcmn.o: $(srcdir)/src/common/fldlgcmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fldlgcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
-@COND_USE_GUI_1@coredll_fontcmn.o: $(srcdir)/src/common/fontcmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
-@COND_USE_GUI_1@coredll_fontenumcmn.o: $(srcdir)/src/common/fontenumcmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontenumcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
-@COND_USE_GUI_1@coredll_fontmap.o: $(srcdir)/src/common/fontmap.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontmap.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
-@COND_USE_GUI_1@coredll_fontutilcmn.o: $(srcdir)/src/common/fontutilcmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontutilcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
-@COND_USE_GUI_1@coredll_framecmn.o: $(srcdir)/src/common/framecmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/framecmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
-@COND_USE_GUI_1@coredll_gaugecmn.o: $(srcdir)/src/common/gaugecmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/gaugecmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
-@COND_USE_GUI_1@coredll_gbsizer.o: $(srcdir)/src/common/gbsizer.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/gbsizer.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
-@COND_USE_GUI_1@coredll_gdicmn.o: $(srcdir)/src/common/gdicmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/gdicmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_app.o: $(srcdir)/src/osx/carbon/app.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
-@COND_USE_GUI_1@coredll_geometry.o: $(srcdir)/src/common/geometry.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/geometry.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_app.o: $(srcdir)/src/osx/carbon/app.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
-@COND_USE_GUI_1@coredll_gifdecod.o: $(srcdir)/src/common/gifdecod.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/gifdecod.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
-@COND_USE_GUI_1@coredll_graphcmn.o: $(srcdir)/src/common/graphcmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/graphcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
-@COND_USE_GUI_1@coredll_helpbase.o: $(srcdir)/src/common/helpbase.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/helpbase.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_control.o: $(srcdir)/src/osx/carbon/control.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
-@COND_USE_GUI_1@coredll_iconbndl.o: $(srcdir)/src/common/iconbndl.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/iconbndl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_control.o: $(srcdir)/src/osx/carbon/control.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
-@COND_USE_GUI_1@coredll_imagall.o: $(srcdir)/src/common/imagall.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/imagall.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
-@COND_USE_GUI_1@coredll_imagbmp.o: $(srcdir)/src/common/imagbmp.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/imagbmp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
-@COND_USE_GUI_1@coredll_image.o: $(srcdir)/src/common/image.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/image.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
-@COND_USE_GUI_1@coredll_imagfill.o: $(srcdir)/src/common/imagfill.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/imagfill.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
-@COND_USE_GUI_1@coredll_imaggif.o: $(srcdir)/src/common/imaggif.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/imaggif.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
-@COND_USE_GUI_1@coredll_imagiff.o: $(srcdir)/src/common/imagiff.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/imagiff.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
-@COND_USE_GUI_1@coredll_imagjpeg.o: $(srcdir)/src/common/imagjpeg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/imagjpeg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
-@COND_USE_GUI_1@coredll_imagpcx.o: $(srcdir)/src/common/imagpcx.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/imagpcx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
-@COND_USE_GUI_1@coredll_imagpng.o: $(srcdir)/src/common/imagpng.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/imagpng.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
-@COND_USE_GUI_1@coredll_imagpnm.o: $(srcdir)/src/common/imagpnm.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/imagpnm.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
-@COND_USE_GUI_1@coredll_imagtga.o: $(srcdir)/src/common/imagtga.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/imagtga.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_dnd.o: $(srcdir)/src/osx/carbon/dnd.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dnd.cpp
-@COND_USE_GUI_1@coredll_imagtiff.o: $(srcdir)/src/common/imagtiff.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/imagtiff.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_dnd.o: $(srcdir)/src/osx/carbon/dnd.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dnd.cpp
-@COND_USE_GUI_1@coredll_imagxpm.o: $(srcdir)/src/common/imagxpm.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/imagxpm.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_font.o: $(srcdir)/src/osx/carbon/font.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
-@COND_USE_GUI_1@coredll_layout.o: $(srcdir)/src/common/layout.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/layout.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_font.o: $(srcdir)/src/osx/carbon/font.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
-@COND_USE_GUI_1@coredll_lboxcmn.o: $(srcdir)/src/common/lboxcmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/lboxcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
-@COND_USE_GUI_1@coredll_listctrlcmn.o: $(srcdir)/src/common/listctrlcmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/listctrlcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
-@COND_USE_GUI_1@coredll_matrix.o: $(srcdir)/src/common/matrix.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/matrix.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_mdi.o: $(srcdir)/src/osx/carbon/mdi.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/mdi.cpp
-@COND_USE_GUI_1@coredll_menucmn.o: $(srcdir)/src/common/menucmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/menucmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_mdi.o: $(srcdir)/src/osx/carbon/mdi.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/mdi.cpp
-@COND_USE_GUI_1@coredll_nbkbase.o: $(srcdir)/src/common/nbkbase.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/nbkbase.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
-@COND_USE_GUI_1@coredll_overlaycmn.o: $(srcdir)/src/common/overlaycmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/overlaycmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
-@COND_USE_GUI_1@coredll_paper.o: $(srcdir)/src/common/paper.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/paper.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
-@COND_USE_GUI_1@coredll_pickerbase.o: $(srcdir)/src/common/pickerbase.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/pickerbase.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
-@COND_USE_GUI_1@coredll_popupcmn.o: $(srcdir)/src/common/popupcmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/popupcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
-@COND_USE_GUI_1@coredll_prntbase.o: $(srcdir)/src/common/prntbase.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/prntbase.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
-@COND_USE_GUI_1@coredll_quantize.o: $(srcdir)/src/common/quantize.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/quantize.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_printdlg.o: $(srcdir)/src/osx/carbon/printdlg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/printdlg.cpp
-@COND_USE_GUI_1@coredll_radiocmn.o: $(srcdir)/src/common/radiocmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/radiocmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_printdlg.o: $(srcdir)/src/osx/carbon/printdlg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/printdlg.cpp
-@COND_USE_GUI_1@coredll_rendcmn.o: $(srcdir)/src/common/rendcmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/rendcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
-@COND_USE_GUI_1@coredll_rgncmn.o: $(srcdir)/src/common/rgncmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/rgncmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
-@COND_USE_GUI_1@coredll_settcmn.o: $(srcdir)/src/common/settcmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/settcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
-@COND_USE_GUI_1@coredll_sizer.o: $(srcdir)/src/common/sizer.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/sizer.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
-@COND_USE_GUI_1@coredll_srchcmn.o: $(srcdir)/src/common/srchcmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/srchcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
-@COND_USE_GUI_1@coredll_statbar.o: $(srcdir)/src/common/statbar.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/statbar.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
-@COND_USE_GUI_1@coredll_stattextcmn.o: $(srcdir)/src/common/stattextcmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/stattextcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_tabctrl.o: $(srcdir)/src/osx/carbon/tabctrl.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/tabctrl.cpp
-@COND_USE_GUI_1@coredll_stockitem.o: $(srcdir)/src/common/stockitem.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/stockitem.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_tabctrl.o: $(srcdir)/src/osx/carbon/tabctrl.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/tabctrl.cpp
-@COND_USE_GUI_1@coredll_tbarbase.o: $(srcdir)/src/common/tbarbase.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/tbarbase.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
-@COND_USE_GUI_1@coredll_textcmn.o: $(srcdir)/src/common/textcmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/textcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
-@COND_USE_GUI_1@coredll_textentrycmn.o: $(srcdir)/src/common/textentrycmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/textentrycmn.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_regiong.o: $(srcdir)/src/generic/regiong.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp
-@COND_USE_GUI_1@coredll_toplvcmn.o: $(srcdir)/src/common/toplvcmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/toplvcmn.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_regiong.o: $(srcdir)/src/generic/regiong.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp
-@COND_USE_GUI_1@coredll_treebase.o: $(srcdir)/src/common/treebase.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/treebase.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
-@COND_USE_GUI_1@coredll_valgen.o: $(srcdir)/src/common/valgen.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/valgen.cpp
+@COND_USE_GUI_1_WXUNIV_1@coredll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
-@COND_USE_GUI_1@coredll_validate.o: $(srcdir)/src/common/validate.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/validate.cpp
+@COND_USE_GUI_1@coredll_accelcmn.o: $(srcdir)/src/common/accelcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/accelcmn.cpp
-@COND_USE_GUI_1@coredll_valtext.o: $(srcdir)/src/common/valtext.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/valtext.cpp
+@COND_USE_GUI_1@coredll_accesscmn.o: $(srcdir)/src/common/accesscmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/accesscmn.cpp
-@COND_USE_GUI_1@coredll_wincmn.o: $(srcdir)/src/common/wincmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/wincmn.cpp
+@COND_USE_GUI_1@coredll_anidecod.o: $(srcdir)/src/common/anidecod.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/anidecod.cpp
-@COND_USE_GUI_1@coredll_windowid.o: $(srcdir)/src/common/windowid.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/windowid.cpp
+@COND_USE_GUI_1@coredll_appcmn.o: $(srcdir)/src/common/appcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/appcmn.cpp
-@COND_USE_GUI_1@coredll_wrapsizer.o: $(srcdir)/src/common/wrapsizer.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/wrapsizer.cpp
+@COND_USE_GUI_1@coredll_artprov.o: $(srcdir)/src/common/artprov.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/artprov.cpp
-@COND_USE_GUI_1@coredll_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/xpmdecod.cpp
+@COND_USE_GUI_1@coredll_artstd.o: $(srcdir)/src/common/artstd.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/artstd.cpp
-@COND_USE_GUI_1@coredll_busyinfo.o: $(srcdir)/src/generic/busyinfo.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/busyinfo.cpp
+@COND_USE_GUI_1@coredll_bmpbase.o: $(srcdir)/src/common/bmpbase.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/bmpbase.cpp
-@COND_USE_GUI_1@coredll_buttonbar.o: $(srcdir)/src/generic/buttonbar.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/buttonbar.cpp
+@COND_USE_GUI_1@coredll_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/bookctrl.cpp
-@COND_USE_GUI_1@coredll_choicdgg.o: $(srcdir)/src/generic/choicdgg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/choicdgg.cpp
+@COND_USE_GUI_1@coredll_btncmn.o: $(srcdir)/src/common/btncmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/btncmn.cpp
-@COND_USE_GUI_1@coredll_choicbkg.o: $(srcdir)/src/generic/choicbkg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/choicbkg.cpp
+@COND_USE_GUI_1@coredll_cairo.o: $(srcdir)/src/common/cairo.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/cairo.cpp
-@COND_USE_GUI_1@coredll_combog.o: $(srcdir)/src/generic/combog.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/combog.cpp
+@COND_USE_GUI_1@coredll_choiccmn.o: $(srcdir)/src/common/choiccmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/choiccmn.cpp
-@COND_USE_GUI_1@coredll_dcpsg.o: $(srcdir)/src/generic/dcpsg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/dcpsg.cpp
+@COND_USE_GUI_1@coredll_clipcmn.o: $(srcdir)/src/common/clipcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/clipcmn.cpp
-@COND_USE_GUI_1@coredll_dirctrlg.o: $(srcdir)/src/generic/dirctrlg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/dirctrlg.cpp
+@COND_USE_GUI_1@coredll_clrpickercmn.o: $(srcdir)/src/common/clrpickercmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/clrpickercmn.cpp
-@COND_USE_GUI_1@coredll_dragimgg.o: $(srcdir)/src/generic/dragimgg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/dragimgg.cpp
+@COND_USE_GUI_1@coredll_colourcmn.o: $(srcdir)/src/common/colourcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/colourcmn.cpp
-@COND_USE_GUI_1@coredll_filectrlg.o: $(srcdir)/src/generic/filectrlg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filectrlg.cpp
+@COND_USE_GUI_1@coredll_combocmn.o: $(srcdir)/src/common/combocmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/combocmn.cpp
-@COND_USE_GUI_1@coredll_listbkg.o: $(srcdir)/src/generic/listbkg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listbkg.cpp
+@COND_USE_GUI_1@coredll_cmdproc.o: $(srcdir)/src/common/cmdproc.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/cmdproc.cpp
-@COND_USE_GUI_1@coredll_logg.o: $(srcdir)/src/generic/logg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/logg.cpp
+@COND_USE_GUI_1@coredll_cmndata.o: $(srcdir)/src/common/cmndata.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/cmndata.cpp
-@COND_USE_GUI_1@coredll_numdlgg.o: $(srcdir)/src/generic/numdlgg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/numdlgg.cpp
+@COND_USE_GUI_1@coredll_containr.o: $(srcdir)/src/common/containr.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/containr.cpp
-@COND_USE_GUI_1@coredll_panelg.o: $(srcdir)/src/generic/panelg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/panelg.cpp
+@COND_USE_GUI_1@coredll_cshelp.o: $(srcdir)/src/common/cshelp.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/cshelp.cpp
-@COND_USE_GUI_1@coredll_progdlgg.o: $(srcdir)/src/generic/progdlgg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/progdlgg.cpp
+@COND_USE_GUI_1@coredll_ctrlcmn.o: $(srcdir)/src/common/ctrlcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/ctrlcmn.cpp
-@COND_USE_GUI_1@coredll_printps.o: $(srcdir)/src/generic/printps.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/printps.cpp
+@COND_USE_GUI_1@coredll_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/ctrlsub.cpp
-@COND_USE_GUI_1@coredll_renderg.o: $(srcdir)/src/generic/renderg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/renderg.cpp
+@COND_USE_GUI_1@coredll_datacmn.o: $(srcdir)/src/common/datacmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/datacmn.cpp
-@COND_USE_GUI_1@coredll_scrlwing.o: $(srcdir)/src/generic/scrlwing.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/scrlwing.cpp
+@COND_USE_GUI_1@coredll_dcbase.o: $(srcdir)/src/common/dcbase.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dcbase.cpp
-@COND_USE_GUI_1@coredll_selstore.o: $(srcdir)/src/generic/selstore.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/selstore.cpp
+@COND_USE_GUI_1@coredll_dcbufcmn.o: $(srcdir)/src/common/dcbufcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dcbufcmn.cpp
-@COND_USE_GUI_1@coredll_spinctlg.o: $(srcdir)/src/generic/spinctlg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/spinctlg.cpp
+@COND_USE_GUI_1@coredll_dcgraph.o: $(srcdir)/src/common/dcgraph.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dcgraph.cpp
-@COND_USE_GUI_1@coredll_splitter.o: $(srcdir)/src/generic/splitter.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/splitter.cpp
+@COND_USE_GUI_1@coredll_dcsvg.o: $(srcdir)/src/common/dcsvg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dcsvg.cpp
-@COND_USE_GUI_1@coredll_srchctlg.o: $(srcdir)/src/generic/srchctlg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/srchctlg.cpp
+@COND_USE_GUI_1@coredll_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dlgcmn.cpp
-@COND_USE_GUI_1@coredll_statbmpg.o: $(srcdir)/src/generic/statbmpg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statbmpg.cpp
+@COND_USE_GUI_1@coredll_dndcmn.o: $(srcdir)/src/common/dndcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dndcmn.cpp
-@COND_USE_GUI_1@coredll_textdlgg.o: $(srcdir)/src/generic/textdlgg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/textdlgg.cpp
+@COND_USE_GUI_1@coredll_dobjcmn.o: $(srcdir)/src/common/dobjcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dobjcmn.cpp
-@COND_USE_GUI_1@coredll_tipwin.o: $(srcdir)/src/generic/tipwin.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/tipwin.cpp
+@COND_USE_GUI_1@coredll_docmdi.o: $(srcdir)/src/common/docmdi.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/docmdi.cpp
-@COND_USE_GUI_1@coredll_toolbkg.o: $(srcdir)/src/generic/toolbkg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/toolbkg.cpp
+@COND_USE_GUI_1@coredll_docview.o: $(srcdir)/src/common/docview.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/docview.cpp
-@COND_USE_GUI_1@coredll_treectlg.o: $(srcdir)/src/generic/treectlg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/treectlg.cpp
+@COND_USE_GUI_1@coredll_dpycmn.o: $(srcdir)/src/common/dpycmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dpycmn.cpp
-@COND_USE_GUI_1@coredll_treebkg.o: $(srcdir)/src/generic/treebkg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/treebkg.cpp
+@COND_USE_GUI_1@coredll_dseldlg.o: $(srcdir)/src/common/dseldlg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dseldlg.cpp
-@COND_USE_GUI_1@coredll_vlbox.o: $(srcdir)/src/generic/vlbox.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/vlbox.cpp
+@COND_USE_GUI_1@coredll_effects.o: $(srcdir)/src/common/effects.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/effects.cpp
-@COND_USE_GUI_1@coredll_vscroll.o: $(srcdir)/src/generic/vscroll.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/vscroll.cpp
+@COND_USE_GUI_1@coredll_fddlgcmn.o: $(srcdir)/src/common/fddlgcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fddlgcmn.cpp
-corelib_event.o: $(srcdir)/src/common/event.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/event.cpp
+@COND_USE_GUI_1@coredll_filectrlcmn.o: $(srcdir)/src/common/filectrlcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/filectrlcmn.cpp
-corelib_fs_mem.o: $(srcdir)/src/common/fs_mem.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/fs_mem.cpp
+@COND_USE_GUI_1@coredll_filepickercmn.o: $(srcdir)/src/common/filepickercmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/filepickercmn.cpp
-corelib_msgout.o: $(srcdir)/src/common/msgout.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/msgout.cpp
+@COND_USE_GUI_1@coredll_fontpickercmn.o: $(srcdir)/src/common/fontpickercmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontpickercmn.cpp
-corelib_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/utilscmn.cpp
+@COND_USE_GUI_1@coredll_fldlgcmn.o: $(srcdir)/src/common/fldlgcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fldlgcmn.cpp
-corelib_mslu.o: $(srcdir)/src/msw/mslu.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/mslu.cpp
+@COND_USE_GUI_1@coredll_fontcmn.o: $(srcdir)/src/common/fontcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontcmn.cpp
-corelib_volume.o: $(srcdir)/src/msw/volume.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/volume.cpp
+@COND_USE_GUI_1@coredll_fontenumcmn.o: $(srcdir)/src/common/fontenumcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontenumcmn.cpp
-corelib_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/uma.cpp
+@COND_USE_GUI_1@coredll_fontmap.o: $(srcdir)/src/common/fontmap.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontmap.cpp
-corelib_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp
+@COND_USE_GUI_1@coredll_fontutilcmn.o: $(srcdir)/src/common/fontutilcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontutilcmn.cpp
-corelib_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp
+@COND_USE_GUI_1@coredll_framecmn.o: $(srcdir)/src/common/framecmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/framecmn.cpp
-corelib_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp
+@COND_USE_GUI_1@coredll_gaugecmn.o: $(srcdir)/src/common/gaugecmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/gaugecmn.cpp
-corelib_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/clrpicker.cpp
+@COND_USE_GUI_1@coredll_gbsizer.o: $(srcdir)/src/common/gbsizer.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/gbsizer.cpp
-corelib_fontpicker.o: $(srcdir)/src/gtk/fontpicker.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/fontpicker.cpp
+@COND_USE_GUI_1@coredll_gdicmn.o: $(srcdir)/src/common/gdicmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/gdicmn.cpp
-corelib_filepicker.o: $(srcdir)/src/gtk/filepicker.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/filepicker.cpp
+@COND_USE_GUI_1@coredll_geometry.o: $(srcdir)/src/common/geometry.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/geometry.cpp
-corelib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/gnome/gprint.cpp
+@COND_USE_GUI_1@coredll_gifdecod.o: $(srcdir)/src/common/gifdecod.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/gifdecod.cpp
-corelib_gvfs.o: $(srcdir)/src/gtk/gnome/gvfs.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/gnome/gvfs.cpp
+@COND_USE_GUI_1@coredll_graphcmn.o: $(srcdir)/src/common/graphcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/graphcmn.cpp
-corelib_mnemonics.o: $(srcdir)/src/gtk/mnemonics.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/mnemonics.cpp
+@COND_USE_GUI_1@coredll_helpbase.o: $(srcdir)/src/common/helpbase.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/helpbase.cpp
-corelib_treeentry_gtk.o: $(srcdir)/src/gtk/treeentry_gtk.c $(CORELIB_ODEP)
- $(CCC) -c -o $@ $(CORELIB_CFLAGS) $(srcdir)/src/gtk/treeentry_gtk.c
+@COND_USE_GUI_1@coredll_iconbndl.o: $(srcdir)/src/common/iconbndl.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/iconbndl.cpp
-corelib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/bmpmotif.cpp
+@COND_USE_GUI_1@coredll_imagall.o: $(srcdir)/src/common/imagall.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/imagall.cpp
-corelib_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/combobox_native.cpp
+@COND_USE_GUI_1@coredll_imagbmp.o: $(srcdir)/src/common/imagbmp.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/imagbmp.cpp
-corelib_gsockmot.o: $(srcdir)/src/motif/gsockmot.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/gsockmot.cpp
+@COND_USE_GUI_1@coredll_image.o: $(srcdir)/src/common/image.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/image.cpp
-corelib_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c $(CORELIB_ODEP)
- $(CCC) -c -o $@ $(CORELIB_CFLAGS) $(srcdir)/src/motif/xmcombo/xmcombo.c
+@COND_USE_GUI_1@coredll_imagfill.o: $(srcdir)/src/common/imagfill.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/imagfill.cpp
-corelib_choicece.o: $(srcdir)/src/msw/wince/choicece.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/wince/choicece.cpp
+@COND_USE_GUI_1@coredll_imaggif.o: $(srcdir)/src/common/imaggif.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/imaggif.cpp
-corelib_crt.o: $(srcdir)/src/msw/wince/crt.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/wince/crt.cpp
+@COND_USE_GUI_1@coredll_imagiff.o: $(srcdir)/src/common/imagiff.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/imagiff.cpp
-corelib_filedlgwce.o: $(srcdir)/src/msw/wince/filedlgwce.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/wince/filedlgwce.cpp
+@COND_USE_GUI_1@coredll_imagjpeg.o: $(srcdir)/src/common/imagjpeg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/imagjpeg.cpp
-corelib_filefnwce.o: $(srcdir)/src/msw/wince/filefnwce.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/wince/filefnwce.cpp
+@COND_USE_GUI_1@coredll_imagpcx.o: $(srcdir)/src/common/imagpcx.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/imagpcx.cpp
-corelib_helpwce.o: $(srcdir)/src/msw/wince/helpwce.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/wince/helpwce.cpp
+@COND_USE_GUI_1@coredll_imagpng.o: $(srcdir)/src/common/imagpng.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/imagpng.cpp
-corelib_menuce.o: $(srcdir)/src/msw/wince/menuce.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/wince/menuce.cpp
+@COND_USE_GUI_1@coredll_imagpnm.o: $(srcdir)/src/common/imagpnm.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/imagpnm.cpp
-corelib_tbarwce.o: $(srcdir)/src/msw/wince/tbarwce.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/wince/tbarwce.cpp
+@COND_USE_GUI_1@coredll_imagtga.o: $(srcdir)/src/common/imagtga.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/imagtga.cpp
-corelib_textctrlce.o: $(srcdir)/src/msw/wince/textctrlce.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/wince/textctrlce.cpp
+@COND_USE_GUI_1@coredll_imagtiff.o: $(srcdir)/src/common/imagtiff.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/imagtiff.cpp
-corelib_listctrl_mac.o: $(srcdir)/src/osx/carbon/listctrl_mac.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/listctrl_mac.cpp
+@COND_USE_GUI_1@coredll_imagxpm.o: $(srcdir)/src/common/imagxpm.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/imagxpm.cpp
-corelib_notebmac.o: $(srcdir)/src/osx/carbon/notebmac.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/notebmac.cpp
+@COND_USE_GUI_1@coredll_layout.o: $(srcdir)/src/common/layout.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/layout.cpp
-corelib_statlmac.o: $(srcdir)/src/osx/carbon/statlmac.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statlmac.cpp
+@COND_USE_GUI_1@coredll_lboxcmn.o: $(srcdir)/src/common/lboxcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/lboxcmn.cpp
-corelib_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/html/htmlctrl/webkit/webkit.mm
+@COND_USE_GUI_1@coredll_listctrlcmn.o: $(srcdir)/src/common/listctrlcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/listctrlcmn.cpp
-corelib_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/NSBox.mm
+@COND_USE_GUI_1@coredll_matrix.o: $(srcdir)/src/common/matrix.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/matrix.cpp
-corelib_NSButton.o: $(srcdir)/src/cocoa/NSButton.mm $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/NSButton.mm
+@COND_USE_GUI_1@coredll_menucmn.o: $(srcdir)/src/common/menucmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/menucmn.cpp
-corelib_NSControl.o: $(srcdir)/src/cocoa/NSControl.mm $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/NSControl.mm
+@COND_USE_GUI_1@coredll_nbkbase.o: $(srcdir)/src/common/nbkbase.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/nbkbase.cpp
-corelib_NSMenu.o: $(srcdir)/src/cocoa/NSMenu.mm $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/NSMenu.mm
+@COND_USE_GUI_1@coredll_overlaycmn.o: $(srcdir)/src/common/overlaycmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/overlaycmn.cpp
-corelib_NSPanel.o: $(srcdir)/src/cocoa/NSPanel.mm $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/NSPanel.mm
+@COND_USE_GUI_1@coredll_paper.o: $(srcdir)/src/common/paper.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/paper.cpp
-corelib_NSScroller.o: $(srcdir)/src/cocoa/NSScroller.mm $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/NSScroller.mm
+@COND_USE_GUI_1@coredll_pickerbase.o: $(srcdir)/src/common/pickerbase.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/pickerbase.cpp
-corelib_NSSlider.o: $(srcdir)/src/cocoa/NSSlider.mm $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/NSSlider.mm
+@COND_USE_GUI_1@coredll_popupcmn.o: $(srcdir)/src/common/popupcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/popupcmn.cpp
-corelib_NSTabView.o: $(srcdir)/src/cocoa/NSTabView.mm $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/NSTabView.mm
+@COND_USE_GUI_1@coredll_prntbase.o: $(srcdir)/src/common/prntbase.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/prntbase.cpp
-corelib_NSTableView.o: $(srcdir)/src/cocoa/NSTableView.mm $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/NSTableView.mm
+@COND_USE_GUI_1@coredll_quantize.o: $(srcdir)/src/common/quantize.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/quantize.cpp
-corelib_NSTextField.o: $(srcdir)/src/cocoa/NSTextField.mm $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/NSTextField.mm
+@COND_USE_GUI_1@coredll_radiocmn.o: $(srcdir)/src/common/radiocmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/radiocmn.cpp
-corelib_NSView.o: $(srcdir)/src/cocoa/NSView.mm $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/NSView.mm
+@COND_USE_GUI_1@coredll_rendcmn.o: $(srcdir)/src/common/rendcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/rendcmn.cpp
-corelib_NSWindow.o: $(srcdir)/src/cocoa/NSWindow.mm $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/NSWindow.mm
+@COND_USE_GUI_1@coredll_rgncmn.o: $(srcdir)/src/common/rgncmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/rgncmn.cpp
-corelib_ObjcRef.o: $(srcdir)/src/cocoa/ObjcRef.mm $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/ObjcRef.mm
+@COND_USE_GUI_1@coredll_settcmn.o: $(srcdir)/src/common/settcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/settcmn.cpp
-corelib_drawer.o: $(srcdir)/src/cocoa/drawer.mm $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/drawer.mm
+@COND_USE_GUI_1@coredll_sizer.o: $(srcdir)/src/common/sizer.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/sizer.cpp
-corelib_mbarman.o: $(srcdir)/src/cocoa/mbarman.mm $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/mbarman.mm
+@COND_USE_GUI_1@coredll_srchcmn.o: $(srcdir)/src/common/srchcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/srchcmn.cpp
-corelib_sound.o: $(srcdir)/src/cocoa/sound.mm $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/sound.mm
+@COND_USE_GUI_1@coredll_statbar.o: $(srcdir)/src/common/statbar.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/statbar.cpp
-corelib_statline2.o: $(srcdir)/src/cocoa/statline2.mm $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/statline2.mm
+@COND_USE_GUI_1@coredll_stattextcmn.o: $(srcdir)/src/common/stattextcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/stattextcmn.cpp
-corelib_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.mm $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/utilsexc.mm
+@COND_USE_GUI_1@coredll_stockitem.o: $(srcdir)/src/common/stockitem.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/stockitem.cpp
-corelib_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/gsockpm.cpp
+@COND_USE_GUI_1@coredll_tbarbase.o: $(srcdir)/src/common/tbarbase.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/tbarbase.cpp
-corelib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/ctrlrend.cpp
+@COND_USE_GUI_1@coredll_textcmn.o: $(srcdir)/src/common/textcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/textcmn.cpp
-corelib_framuniv.o: $(srcdir)/src/univ/framuniv.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/framuniv.cpp
+@COND_USE_GUI_1@coredll_textentrycmn.o: $(srcdir)/src/common/textentrycmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/textentrycmn.cpp
-corelib_inpcons.o: $(srcdir)/src/univ/inpcons.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/inpcons.cpp
+@COND_USE_GUI_1@coredll_toplvcmn.o: $(srcdir)/src/common/toplvcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/toplvcmn.cpp
-corelib_inphand.o: $(srcdir)/src/univ/inphand.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/inphand.cpp
+@COND_USE_GUI_1@coredll_treebase.o: $(srcdir)/src/common/treebase.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/treebase.cpp
-corelib_scrarrow.o: $(srcdir)/src/univ/scrarrow.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/scrarrow.cpp
+@COND_USE_GUI_1@coredll_valgen.o: $(srcdir)/src/common/valgen.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/valgen.cpp
-corelib_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/scrthumb.cpp
+@COND_USE_GUI_1@coredll_validate.o: $(srcdir)/src/common/validate.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/validate.cpp
-corelib_settingsuniv.o: $(srcdir)/src/univ/settingsuniv.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/settingsuniv.cpp
+@COND_USE_GUI_1@coredll_valtext.o: $(srcdir)/src/common/valtext.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/valtext.cpp
-corelib_stdrend.o: $(srcdir)/src/univ/stdrend.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/stdrend.cpp
+@COND_USE_GUI_1@coredll_wincmn.o: $(srcdir)/src/common/wincmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/wincmn.cpp
-corelib_theme.o: $(srcdir)/src/univ/theme.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/theme.cpp
+@COND_USE_GUI_1@coredll_windowid.o: $(srcdir)/src/common/windowid.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/windowid.cpp
-corelib_topluniv.o: $(srcdir)/src/univ/topluniv.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/topluniv.cpp
+@COND_USE_GUI_1@coredll_wrapsizer.o: $(srcdir)/src/common/wrapsizer.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/wrapsizer.cpp
-corelib_winuniv.o: $(srcdir)/src/univ/winuniv.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/winuniv.cpp
+@COND_USE_GUI_1@coredll_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/xpmdecod.cpp
-corelib_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/themes/gtk.cpp
+@COND_USE_GUI_1@coredll_busyinfo.o: $(srcdir)/src/generic/busyinfo.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/busyinfo.cpp
-corelib_metal.o: $(srcdir)/src/univ/themes/metal.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/themes/metal.cpp
+@COND_USE_GUI_1@coredll_buttonbar.o: $(srcdir)/src/generic/buttonbar.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/buttonbar.cpp
-corelib_mono.o: $(srcdir)/src/univ/themes/mono.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/themes/mono.cpp
+@COND_USE_GUI_1@coredll_choicdgg.o: $(srcdir)/src/generic/choicdgg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/choicdgg.cpp
-corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/themes/win32.cpp
+@COND_USE_GUI_1@coredll_choicbkg.o: $(srcdir)/src/generic/choicbkg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/choicbkg.cpp
-@COND_PLATFORM_WIN32_1@corelib_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp
+@COND_USE_GUI_1@coredll_combog.o: $(srcdir)/src/generic/combog.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/combog.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/evtloop.cpp
+@COND_USE_GUI_1@coredll_dcpsg.o: $(srcdir)/src/generic/dcpsg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/dcpsg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_evtloop.o: $(srcdir)/src/gtk1/evtloop.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/evtloop.cpp
+@COND_USE_GUI_1@coredll_dirctrlg.o: $(srcdir)/src/generic/dirctrlg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/dirctrlg.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_evtloop.o: $(srcdir)/src/x11/evtloop.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/evtloop.cpp
+@COND_USE_GUI_1@coredll_dragimgg.o: $(srcdir)/src/generic/dragimgg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/dragimgg.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/evtloop.cpp
+@COND_USE_GUI_1@coredll_filectrlg.o: $(srcdir)/src/generic/filectrlg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filectrlg.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_evtloop.o: $(srcdir)/src/dfb/evtloop.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/evtloop.cpp
+@COND_USE_GUI_1@coredll_listbkg.o: $(srcdir)/src/generic/listbkg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listbkg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_evtloop.o: $(srcdir)/src/motif/evtloop.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/evtloop.cpp
+@COND_USE_GUI_1@coredll_logg.o: $(srcdir)/src/generic/logg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/logg.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_evtloop.o: $(srcdir)/src/osx/carbon/evtloop.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/evtloop.cpp
+@COND_USE_GUI_1@coredll_numdlgg.o: $(srcdir)/src/generic/numdlgg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/numdlgg.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_evtloop.o: $(srcdir)/src/osx/cocoa/evtloop.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/evtloop.mm
+@COND_USE_GUI_1@coredll_panelg.o: $(srcdir)/src/generic/panelg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/panelg.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/evtloop.mm
+@COND_USE_GUI_1@coredll_progdlgg.o: $(srcdir)/src/generic/progdlgg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/progdlgg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_evtloop.o: $(srcdir)/src/os2/evtloop.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/evtloop.cpp
+@COND_USE_GUI_1@coredll_printps.o: $(srcdir)/src/generic/printps.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/printps.cpp
-@COND_PLATFORM_WIN32_1@corelib_main.o: $(srcdir)/src/msw/main.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/main.cpp
+@COND_USE_GUI_1@coredll_renderg.o: $(srcdir)/src/generic/renderg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/renderg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_main.o: $(srcdir)/src/gtk1/main.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/main.cpp
+@COND_USE_GUI_1@coredll_scrlwing.o: $(srcdir)/src/generic/scrlwing.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/scrlwing.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_main.o: $(srcdir)/src/motif/main.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/main.cpp
+@COND_USE_GUI_1@coredll_selstore.o: $(srcdir)/src/generic/selstore.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/selstore.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_main.o: $(srcdir)/src/cocoa/main.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/main.cpp
+@COND_USE_GUI_1@coredll_spinctlg.o: $(srcdir)/src/generic/spinctlg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/spinctlg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_main.o: $(srcdir)/src/os2/main.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/main.cpp
+@COND_USE_GUI_1@coredll_splitter.o: $(srcdir)/src/generic/splitter.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/splitter.cpp
-@COND_TOOLKIT_OSX_CARBON@corelib_utils.o: $(srcdir)/src/osx/carbon/utils.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/utils.cpp
+@COND_USE_GUI_1@coredll_srchctlg.o: $(srcdir)/src/generic/srchctlg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/srchctlg.cpp
-@COND_TOOLKIT_OSX_COCOA@corelib_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm
+@COND_USE_GUI_1@coredll_statbmpg.o: $(srcdir)/src/generic/statbmpg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statbmpg.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_utils.o: $(srcdir)/src/x11/utils.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/utils.cpp
+@COND_USE_GUI_1@coredll_textdlgg.o: $(srcdir)/src/generic/textdlgg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/textdlgg.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_utils.o: $(srcdir)/src/mgl/utils.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/utils.cpp
+@COND_USE_GUI_1@coredll_tipwin.o: $(srcdir)/src/generic/tipwin.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/tipwin.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_utils.o: $(srcdir)/src/dfb/utils.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/utils.cpp
+@COND_USE_GUI_1@coredll_toolbkg.o: $(srcdir)/src/generic/toolbkg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/toolbkg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_utils.o: $(srcdir)/src/motif/utils.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/utils.cpp
+@COND_USE_GUI_1@coredll_treectlg.o: $(srcdir)/src/generic/treectlg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/treectlg.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_utils.o: $(srcdir)/src/cocoa/utils.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/utils.mm
+@COND_USE_GUI_1@coredll_treebkg.o: $(srcdir)/src/generic/treebkg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/treebkg.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+@COND_USE_GUI_1@coredll_vlbox.o: $(srcdir)/src/generic/vlbox.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/vlbox.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+@COND_USE_GUI_1@coredll_vscroll.o: $(srcdir)/src/generic/vscroll.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/vscroll.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+corelib_event.o: $(srcdir)/src/common/event.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/event.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+corelib_fs_mem.o: $(srcdir)/src/common/fs_mem.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/fs_mem.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+corelib_msgout.o: $(srcdir)/src/common/msgout.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/msgout.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+corelib_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/utilscmn.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+corelib_msw_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+corelib_msw_main.o: $(srcdir)/src/msw/main.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/main.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+corelib_mslu.o: $(srcdir)/src/msw/mslu.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/mslu.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+corelib_volume.o: $(srcdir)/src/msw/volume.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/volume.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_caret.o: $(srcdir)/src/msw/caret.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/caret.cpp
+corelib_carbon_utils.o: $(srcdir)/src/osx/carbon/utils.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/utils.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_caret.o: $(srcdir)/src/msw/caret.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/caret.cpp
+corelib_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/uma.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+corelib_osx_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+corelib_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+corelib_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+corelib_gtk_bmpbuttn.o: $(srcdir)/src/gtk/bmpbuttn.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/bmpbuttn.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+corelib_gtk_button.o: $(srcdir)/src/gtk/button.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/button.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+corelib_gtk_checkbox.o: $(srcdir)/src/gtk/checkbox.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/checkbox.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+corelib_gtk_checklst.o: $(srcdir)/src/gtk/checklst.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/checklst.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+corelib_gtk_choice.o: $(srcdir)/src/gtk/choice.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/choice.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
+corelib_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
+corelib_gtk_colordlg.o: $(srcdir)/src/gtk/colordlg.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/colordlg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
+corelib_gtk_combobox.o: $(srcdir)/src/gtk/combobox.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/combobox.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
+corelib_gtk_control.o: $(srcdir)/src/gtk/control.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/control.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_dialup.o: $(srcdir)/src/unix/dialup.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
+corelib_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/clrpicker.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_dialup.o: $(srcdir)/src/unix/dialup.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
+corelib_gtk_dialog.o: $(srcdir)/src/gtk/dialog.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/dialog.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_dialup.o: $(srcdir)/src/unix/dialup.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
+corelib_fontpicker.o: $(srcdir)/src/gtk/fontpicker.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/fontpicker.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_dialup.o: $(srcdir)/src/unix/dialup.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
+corelib_filepicker.o: $(srcdir)/src/gtk/filepicker.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/filepicker.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_dialup.o: $(srcdir)/src/msw/dialup.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp
+corelib_gtk_dirdlg.o: $(srcdir)/src/gtk/dirdlg.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/dirdlg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_dialup.o: $(srcdir)/src/msw/dialup.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp
+corelib_gtk_filedlg.o: $(srcdir)/src/gtk/filedlg.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/filedlg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
+corelib_gtk_fontdlg.o: $(srcdir)/src/gtk/fontdlg.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/fontdlg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
+corelib_gtk_frame.o: $(srcdir)/src/gtk/frame.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/frame.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
+corelib_gtk_gauge.o: $(srcdir)/src/gtk/gauge.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/gauge.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
+corelib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/gnome/gprint.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp
+corelib_gvfs.o: $(srcdir)/src/gtk/gnome/gvfs.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/gnome/gvfs.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp
+corelib_gtk_print.o: $(srcdir)/src/gtk/print.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/print.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
+corelib_gtk_listbox.o: $(srcdir)/src/gtk/listbox.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/listbox.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
+corelib_gtk_mdi.o: $(srcdir)/src/gtk/mdi.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/mdi.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_fontenum.o: $(srcdir)/src/mgl/fontenum.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/fontenum.cpp
+corelib_gtk_menu.o: $(srcdir)/src/gtk/menu.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/menu.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_fontenum.o: $(srcdir)/src/dfb/fontenum.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/fontenum.cpp
+corelib_mnemonics.o: $(srcdir)/src/gtk/mnemonics.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/mnemonics.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontenum.o: $(srcdir)/src/cocoa/fontenum.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/fontenum.mm
+corelib_gtk_msgdlg.o: $(srcdir)/src/gtk/msgdlg.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/msgdlg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_fontenum.o: $(srcdir)/src/os2/fontenum.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/fontenum.cpp
+corelib_gtk_nativewin.o: $(srcdir)/src/gtk/nativewin.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/nativewin.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
+corelib_gtk_notebook.o: $(srcdir)/src/gtk/notebook.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/notebook.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
+corelib_gtk_radiobox.o: $(srcdir)/src/gtk/radiobox.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/radiobox.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
+corelib_gtk_radiobut.o: $(srcdir)/src/gtk/radiobut.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/radiobut.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
+corelib_gtk_scrolbar.o: $(srcdir)/src/gtk/scrolbar.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/scrolbar.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp
+corelib_gtk_scrolwin.o: $(srcdir)/src/gtk/scrolwin.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/scrolwin.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp
+corelib_gtk_slider.o: $(srcdir)/src/gtk/slider.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/slider.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
+corelib_gtk_spinbutt.o: $(srcdir)/src/gtk/spinbutt.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/spinbutt.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
+corelib_gtk_spinctrl.o: $(srcdir)/src/gtk/spinctrl.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/spinctrl.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_fontutil.o: $(srcdir)/src/mgl/fontutil.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/fontutil.cpp
+corelib_gtk_statbmp.o: $(srcdir)/src/gtk/statbmp.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/statbmp.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontutil.o: $(srcdir)/src/cocoa/fontutil.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/fontutil.cpp
+corelib_gtk_statbox.o: $(srcdir)/src/gtk/statbox.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/statbox.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_fontutil.o: $(srcdir)/src/os2/fontutil.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/fontutil.cpp
+corelib_gtk_statline.o: $(srcdir)/src/gtk/statline.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/statline.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
+corelib_gtk_stattext.o: $(srcdir)/src/gtk/stattext.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/stattext.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
+corelib_gtk_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/tbargtk.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
+corelib_gtk_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/textctrl.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
+corelib_gtk_textentry.o: $(srcdir)/src/gtk/textentry.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/textentry.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+corelib_gtk_tglbtn.o: $(srcdir)/src/gtk/tglbtn.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/tglbtn.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+corelib_treeentry_gtk.o: $(srcdir)/src/gtk/treeentry_gtk.c $(CORELIB_ODEP)
+ $(CCC) -c -o $@ $(CORELIB_CFLAGS) $(srcdir)/src/gtk/treeentry_gtk.c
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+corelib_gtk1_bmpbuttn.o: $(srcdir)/src/gtk1/bmpbuttn.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/bmpbuttn.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+corelib_gtk1_button.o: $(srcdir)/src/gtk1/button.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/button.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+corelib_gtk1_checkbox.o: $(srcdir)/src/gtk1/checkbox.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/checkbox.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+corelib_gtk1_checklst.o: $(srcdir)/src/gtk1/checklst.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/checklst.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+corelib_gtk1_choice.o: $(srcdir)/src/gtk1/choice.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/choice.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+corelib_gtk1_combobox.o: $(srcdir)/src/gtk1/combobox.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/combobox.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+corelib_gtk1_control.o: $(srcdir)/src/gtk1/control.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/control.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_icon.o: $(srcdir)/src/msw/icon.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
+corelib_gtk1_dialog.o: $(srcdir)/src/gtk1/dialog.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/dialog.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_icon.o: $(srcdir)/src/msw/icon.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
+corelib_gtk1_filedlg.o: $(srcdir)/src/gtk1/filedlg.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/filedlg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_icon.o: $(srcdir)/src/motif/icon.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/icon.cpp
+corelib_gtk1_fontdlg.o: $(srcdir)/src/gtk1/fontdlg.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/fontdlg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
+corelib_gtk1_frame.o: $(srcdir)/src/gtk1/frame.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/frame.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
+corelib_gtk1_gauge.o: $(srcdir)/src/gtk1/gauge.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/gauge.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_icon.o: $(srcdir)/src/cocoa/icon.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/icon.mm
+corelib_gtk1_listbox.o: $(srcdir)/src/gtk1/listbox.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/listbox.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_icon.o: $(srcdir)/src/os2/icon.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/icon.cpp
+corelib_gtk1_mdi.o: $(srcdir)/src/gtk1/mdi.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/mdi.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
+corelib_gtk1_menu.o: $(srcdir)/src/gtk1/menu.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/menu.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
+corelib_gtk1_notebook.o: $(srcdir)/src/gtk1/notebook.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/notebook.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
+corelib_gtk1_radiobox.o: $(srcdir)/src/gtk1/radiobox.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/radiobox.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_app.o: $(srcdir)/src/gtk/app.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/app.cpp
+corelib_gtk1_radiobut.o: $(srcdir)/src/gtk1/radiobut.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/radiobut.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_app.o: $(srcdir)/src/gtk1/app.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/app.cpp
+corelib_gtk1_scrolbar.o: $(srcdir)/src/gtk1/scrolbar.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/scrolbar.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_app.o: $(srcdir)/src/msw/app.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/app.cpp
+corelib_gtk1_scrolwin.o: $(srcdir)/src/gtk1/scrolwin.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/scrolwin.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_app.o: $(srcdir)/src/msw/app.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/app.cpp
+corelib_gtk1_slider.o: $(srcdir)/src/gtk1/slider.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/slider.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_app.o: $(srcdir)/src/x11/app.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/app.cpp
+corelib_gtk1_spinbutt.o: $(srcdir)/src/gtk1/spinbutt.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/spinbutt.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_app.o: $(srcdir)/src/mgl/app.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/app.cpp
+corelib_gtk1_spinctrl.o: $(srcdir)/src/gtk1/spinctrl.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/spinctrl.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_app.o: $(srcdir)/src/dfb/app.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/app.cpp
+corelib_gtk1_statbmp.o: $(srcdir)/src/gtk1/statbmp.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/statbmp.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_app.o: $(srcdir)/src/motif/app.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/app.cpp
+corelib_gtk1_statbox.o: $(srcdir)/src/gtk1/statbox.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/statbox.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_app.o: $(srcdir)/src/osx/carbon/app.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
+corelib_gtk1_statline.o: $(srcdir)/src/gtk1/statline.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/statline.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_app.o: $(srcdir)/src/osx/carbon/app.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
+corelib_gtk1_stattext.o: $(srcdir)/src/gtk1/stattext.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/stattext.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_app.o: $(srcdir)/src/cocoa/app.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/app.mm
+corelib_gtk1_tbargtk.o: $(srcdir)/src/gtk1/tbargtk.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/tbargtk.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_app.o: $(srcdir)/src/os2/app.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/app.cpp
+corelib_gtk1_textctrl.o: $(srcdir)/src/gtk1/textctrl.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/textctrl.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.c $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CCC) -c -o $@ $(CORELIB_CFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.c
+corelib_gtk1_tglbtn.o: $(srcdir)/src/gtk1/tglbtn.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/tglbtn.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/bitmap.cpp
+corelib_motif_accel.o: $(srcdir)/src/motif/accel.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/accel.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_bitmap.o: $(srcdir)/src/gtk1/bitmap.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/bitmap.cpp
+corelib_motif_app.o: $(srcdir)/src/motif/app.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/app.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
+corelib_motif_bmpbuttn.o: $(srcdir)/src/motif/bmpbuttn.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/bmpbuttn.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
+corelib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/bmpmotif.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp
+corelib_motif_button.o: $(srcdir)/src/motif/button.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/button.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp
+corelib_motif_checkbox.o: $(srcdir)/src/motif/checkbox.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/checkbox.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
+corelib_motif_checklst.o: $(srcdir)/src/motif/checklst.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/checklst.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
+corelib_motif_choice.o: $(srcdir)/src/motif/choice.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/choice.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_bitmap.o: $(srcdir)/src/mgl/bitmap.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/bitmap.cpp
+corelib_motif_clipbrd.o: $(srcdir)/src/motif/clipbrd.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/clipbrd.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_bitmap.o: $(srcdir)/src/dfb/bitmap.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/bitmap.cpp
+corelib_motif_colour.o: $(srcdir)/src/motif/colour.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/colour.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_bitmap.o: $(srcdir)/src/cocoa/bitmap.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/bitmap.mm
+corelib_motif_combobox.o: $(srcdir)/src/motif/combobox.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/combobox.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_bitmap.o: $(srcdir)/src/os2/bitmap.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/bitmap.cpp
+corelib_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/combobox_native.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_brush.o: $(srcdir)/src/gtk/brush.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/brush.cpp
+corelib_motif_control.o: $(srcdir)/src/motif/control.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/control.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_brush.o: $(srcdir)/src/gtk1/brush.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/brush.cpp
+corelib_motif_cursor.o: $(srcdir)/src/motif/cursor.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/cursor.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_brush.o: $(srcdir)/src/x11/brush.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
+corelib_motif_data.o: $(srcdir)/src/motif/data.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/data.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_brush.o: $(srcdir)/src/x11/brush.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
+corelib_motif_dataobj.o: $(srcdir)/src/motif/dataobj.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/dataobj.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_brush.o: $(srcdir)/src/msw/brush.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/brush.cpp
+corelib_motif_dc.o: $(srcdir)/src/motif/dc.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/dc.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_brush.o: $(srcdir)/src/msw/brush.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/brush.cpp
+corelib_motif_dcclient.o: $(srcdir)/src/motif/dcclient.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/dcclient.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_brush.o: $(srcdir)/src/osx/brush.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
+corelib_motif_dcmemory.o: $(srcdir)/src/motif/dcmemory.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/dcmemory.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_brush.o: $(srcdir)/src/osx/brush.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
+corelib_motif_dcscreen.o: $(srcdir)/src/motif/dcscreen.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/dcscreen.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_brush.o: $(srcdir)/src/mgl/brush.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/brush.cpp
+corelib_motif_dialog.o: $(srcdir)/src/motif/dialog.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/dialog.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_brush.o: $(srcdir)/src/dfb/brush.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/brush.cpp
+corelib_motif_evtloop.o: $(srcdir)/src/motif/evtloop.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/evtloop.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_brush.o: $(srcdir)/src/cocoa/brush.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/brush.mm
+corelib_motif_filedlg.o: $(srcdir)/src/motif/filedlg.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/filedlg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_brush.o: $(srcdir)/src/os2/brush.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/brush.cpp
+corelib_motif_font.o: $(srcdir)/src/motif/font.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/font.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_clipbrd.o: $(srcdir)/src/gtk/clipbrd.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/clipbrd.cpp
+corelib_motif_frame.o: $(srcdir)/src/motif/frame.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/frame.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_clipbrd.o: $(srcdir)/src/gtk1/clipbrd.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/clipbrd.cpp
+corelib_motif_gauge.o: $(srcdir)/src/motif/gauge.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/gauge.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/clipbrd.cpp
+corelib_gsockmot.o: $(srcdir)/src/motif/gsockmot.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/gsockmot.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/clipbrd.cpp
+corelib_motif_icon.o: $(srcdir)/src/motif/icon.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/icon.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_clipbrd.o: $(srcdir)/src/x11/clipbrd.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/clipbrd.cpp
+corelib_motif_listbox.o: $(srcdir)/src/motif/listbox.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/listbox.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_clipbrd.o: $(srcdir)/src/mgl/clipbrd.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/clipbrd.cpp
+corelib_motif_main.o: $(srcdir)/src/motif/main.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/main.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_clipbrd.o: $(srcdir)/src/motif/clipbrd.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/clipbrd.cpp
+corelib_motif_mdi.o: $(srcdir)/src/motif/mdi.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/mdi.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
+corelib_motif_menu.o: $(srcdir)/src/motif/menu.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/menu.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
+corelib_motif_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/menuitem.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_clipbrd.o: $(srcdir)/src/cocoa/clipbrd.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/clipbrd.mm
+corelib_motif_minifram.o: $(srcdir)/src/motif/minifram.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/minifram.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_clipbrd.o: $(srcdir)/src/os2/clipbrd.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/clipbrd.cpp
+corelib_motif_msgdlg.o: $(srcdir)/src/motif/msgdlg.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/msgdlg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_colour.o: $(srcdir)/src/gtk/colour.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/colour.cpp
+corelib_motif_popupwin.o: $(srcdir)/src/motif/popupwin.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/popupwin.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_colour.o: $(srcdir)/src/gtk1/colour.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/colour.cpp
+corelib_motif_radiobox.o: $(srcdir)/src/motif/radiobox.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/radiobox.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_colour.o: $(srcdir)/src/msw/colour.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/colour.cpp
+corelib_motif_radiobut.o: $(srcdir)/src/motif/radiobut.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/radiobut.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_colour.o: $(srcdir)/src/msw/colour.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/colour.cpp
+corelib_motif_scrolbar.o: $(srcdir)/src/motif/scrolbar.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/scrolbar.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_colour.o: $(srcdir)/src/osx/core/colour.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
+corelib_motif_settings.o: $(srcdir)/src/motif/settings.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/settings.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_colour.o: $(srcdir)/src/osx/core/colour.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
+corelib_motif_slider.o: $(srcdir)/src/motif/slider.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/slider.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_colour.o: $(srcdir)/src/x11/colour.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/colour.cpp
+corelib_motif_spinbutt.o: $(srcdir)/src/motif/spinbutt.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/spinbutt.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_colour.o: $(srcdir)/src/generic/colour.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
+corelib_motif_statbmp.o: $(srcdir)/src/motif/statbmp.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/statbmp.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_colour.o: $(srcdir)/src/generic/colour.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
+corelib_motif_statbox.o: $(srcdir)/src/motif/statbox.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/statbox.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_colour.o: $(srcdir)/src/motif/colour.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/colour.cpp
+corelib_motif_stattext.o: $(srcdir)/src/motif/stattext.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/stattext.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_colour.o: $(srcdir)/src/cocoa/colour.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/colour.mm
+corelib_motif_textctrl.o: $(srcdir)/src/motif/textctrl.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/textctrl.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_colour.o: $(srcdir)/src/os2/colour.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/colour.cpp
+corelib_motif_textentry.o: $(srcdir)/src/motif/textentry.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/textentry.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_cursor.o: $(srcdir)/src/gtk/cursor.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/cursor.cpp
+corelib_motif_timer.o: $(srcdir)/src/motif/timer.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/timer.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_cursor.o: $(srcdir)/src/gtk1/cursor.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/cursor.cpp
+corelib_motif_toolbar.o: $(srcdir)/src/motif/toolbar.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/toolbar.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_cursor.o: $(srcdir)/src/msw/cursor.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/cursor.cpp
+corelib_motif_toplevel.o: $(srcdir)/src/motif/toplevel.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/toplevel.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_cursor.o: $(srcdir)/src/msw/cursor.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/cursor.cpp
+corelib_motif_utils.o: $(srcdir)/src/motif/utils.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/utils.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_cursor.o: $(srcdir)/src/x11/cursor.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/cursor.cpp
+corelib_motif_window.o: $(srcdir)/src/motif/window.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/window.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_cursor.o: $(srcdir)/src/mgl/cursor.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/cursor.cpp
+corelib_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c $(CORELIB_ODEP)
+ $(CCC) -c -o $@ $(CORELIB_CFLAGS) $(srcdir)/src/motif/xmcombo/xmcombo.c
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_cursor.o: $(srcdir)/src/dfb/cursor.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/cursor.cpp
+corelib_generic_notebook.o: $(srcdir)/src/generic/notebook.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/notebook.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_cursor.o: $(srcdir)/src/motif/cursor.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/cursor.cpp
+corelib_generic_statline.o: $(srcdir)/src/generic/statline.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statline.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
+corelib_msw_checklst.o: $(srcdir)/src/msw/checklst.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
+corelib_msw_fdrepdlg.o: $(srcdir)/src/msw/fdrepdlg.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/fdrepdlg.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_cursor.o: $(srcdir)/src/cocoa/cursor.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/cursor.mm
+corelib_msw_fontdlg.o: $(srcdir)/src/msw/fontdlg.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/fontdlg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_cursor.o: $(srcdir)/src/os2/cursor.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/cursor.cpp
+corelib_wince_checklst.o: $(srcdir)/src/msw/wince/checklst.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/wince/checklst.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_dataobj.o: $(srcdir)/src/gtk/dataobj.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/dataobj.cpp
+corelib_choicece.o: $(srcdir)/src/msw/wince/choicece.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/wince/choicece.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_dataobj.o: $(srcdir)/src/gtk1/dataobj.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/dataobj.cpp
+corelib_crt.o: $(srcdir)/src/msw/wince/crt.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/wince/crt.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/dataobj.cpp
+corelib_filedlgwce.o: $(srcdir)/src/msw/wince/filedlgwce.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/wince/filedlgwce.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/dataobj.cpp
+corelib_filefnwce.o: $(srcdir)/src/msw/wince/filefnwce.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/wince/filefnwce.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_dataobj.o: $(srcdir)/src/x11/dataobj.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/dataobj.cpp
+corelib_helpwce.o: $(srcdir)/src/msw/wince/helpwce.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/wince/helpwce.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_dataobj.o: $(srcdir)/src/motif/dataobj.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/dataobj.cpp
+corelib_menuce.o: $(srcdir)/src/msw/wince/menuce.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/wince/menuce.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
+corelib_tbarwce.o: $(srcdir)/src/msw/wince/tbarwce.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/wince/tbarwce.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
+corelib_textctrlce.o: $(srcdir)/src/msw/wince/textctrlce.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/wince/textctrlce.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_dataobj.o: $(srcdir)/src/cocoa/dataobj.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/dataobj.mm
+corelib_carbon_bmpbuttn.o: $(srcdir)/src/osx/carbon/bmpbuttn.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/bmpbuttn.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dataobj.o: $(srcdir)/src/os2/dataobj.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dataobj.cpp
+corelib_carbon_button.o: $(srcdir)/src/osx/carbon/button.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/button.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_dc.o: $(srcdir)/src/gtk/dc.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/dc.cpp
+corelib_carbon_checkbox.o: $(srcdir)/src/osx/carbon/checkbox.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/checkbox.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_dc.o: $(srcdir)/src/gtk1/dc.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/dc.cpp
+corelib_carbon_choice.o: $(srcdir)/src/osx/carbon/choice.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/choice.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_dc.o: $(srcdir)/src/msw/dc.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dc.cpp
+corelib_carbon_colordlg.o: $(srcdir)/src/osx/carbon/colordlg.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/colordlg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_dc.o: $(srcdir)/src/msw/dc.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dc.cpp
+corelib_carbon_dialog.o: $(srcdir)/src/osx/carbon/dialog.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dialog.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_dc.o: $(srcdir)/src/x11/dc.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/dc.cpp
+corelib_carbon_dirdlg.o: $(srcdir)/src/osx/carbon/dirdlg.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dirdlg.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_dc.o: $(srcdir)/src/mgl/dc.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/dc.cpp
+corelib_carbon_evtloop.o: $(srcdir)/src/osx/carbon/evtloop.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/evtloop.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dc.o: $(srcdir)/src/dfb/dc.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/dc.cpp
+corelib_carbon_filedlg.o: $(srcdir)/src/osx/carbon/filedlg.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/filedlg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_dc.o: $(srcdir)/src/motif/dc.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/dc.cpp
+corelib_carbon_gauge.o: $(srcdir)/src/osx/carbon/gauge.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/gauge.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_dc.o: $(srcdir)/src/cocoa/dc.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/dc.mm
+corelib_carbon_listbox.o: $(srcdir)/src/osx/carbon/listbox.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/listbox.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dc.o: $(srcdir)/src/os2/dc.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dc.cpp
+corelib_listctrl_mac.o: $(srcdir)/src/osx/carbon/listctrl_mac.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/listctrl_mac.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_dcclient.o: $(srcdir)/src/gtk/dcclient.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/dcclient.cpp
+corelib_carbon_menu.o: $(srcdir)/src/osx/carbon/menu.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/menu.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_dcclient.o: $(srcdir)/src/gtk1/dcclient.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/dcclient.cpp
+corelib_carbon_menuitem.o: $(srcdir)/src/osx/carbon/menuitem.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/menuitem.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dcclient.cpp
+corelib_carbon_msgdlg.o: $(srcdir)/src/osx/carbon/msgdlg.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/msgdlg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dcclient.cpp
+corelib_carbon_nonownedwnd.o: $(srcdir)/src/osx/carbon/nonownedwnd.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/nonownedwnd.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_dcclient.o: $(srcdir)/src/x11/dcclient.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/dcclient.cpp
+corelib_notebmac.o: $(srcdir)/src/osx/carbon/notebmac.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/notebmac.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/dcclient.cpp
+corelib_carbon_radiobut.o: $(srcdir)/src/osx/carbon/radiobut.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/radiobut.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dcclient.o: $(srcdir)/src/dfb/dcclient.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/dcclient.cpp
+corelib_carbon_region.o: $(srcdir)/src/osx/carbon/region.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/region.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_dcclient.o: $(srcdir)/src/motif/dcclient.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/dcclient.cpp
+corelib_carbon_scrolbar.o: $(srcdir)/src/osx/carbon/scrolbar.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/scrolbar.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
+corelib_carbon_slider.o: $(srcdir)/src/osx/carbon/slider.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/slider.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
+corelib_carbon_spinbutt.o: $(srcdir)/src/osx/carbon/spinbutt.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/spinbutt.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_dcclient.o: $(srcdir)/src/cocoa/dcclient.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/dcclient.mm
+corelib_carbon_srchctrl.o: $(srcdir)/src/osx/carbon/srchctrl.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/srchctrl.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dcclient.o: $(srcdir)/src/os2/dcclient.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dcclient.cpp
+corelib_carbon_statbmp.o: $(srcdir)/src/osx/carbon/statbmp.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statbmp.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_dcmemory.o: $(srcdir)/src/gtk/dcmemory.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/dcmemory.cpp
+corelib_carbon_statbox.o: $(srcdir)/src/osx/carbon/statbox.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statbox.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_dcmemory.o: $(srcdir)/src/gtk1/dcmemory.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/dcmemory.cpp
+corelib_statlmac.o: $(srcdir)/src/osx/carbon/statlmac.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statlmac.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp
+corelib_carbon_stattext.o: $(srcdir)/src/osx/carbon/stattext.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/stattext.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp
+corelib_carbon_textctrl.o: $(srcdir)/src/osx/carbon/textctrl.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/textctrl.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
+corelib_carbon_tglbtn.o: $(srcdir)/src/osx/carbon/tglbtn.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/tglbtn.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
+corelib_carbon_toolbar.o: $(srcdir)/src/osx/carbon/toolbar.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/toolbar.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_dcmemory.o: $(srcdir)/src/x11/dcmemory.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/dcmemory.cpp
+corelib_carbon_tooltip.o: $(srcdir)/src/osx/carbon/tooltip.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/tooltip.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_dcmemory.o: $(srcdir)/src/mgl/dcmemory.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/dcmemory.cpp
+corelib_carbon_window.o: $(srcdir)/src/osx/carbon/window.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/window.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dcmemory.o: $(srcdir)/src/dfb/dcmemory.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/dcmemory.cpp
+corelib_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/html/htmlctrl/webkit/webkit.mm
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_dcmemory.o: $(srcdir)/src/motif/dcmemory.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/dcmemory.cpp
+corelib_osx_cocoa_bmpbuttn.o: $(srcdir)/src/osx/cocoa/bmpbuttn.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/bmpbuttn.mm
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/dcmemory.mm
+corelib_osx_cocoa_button.o: $(srcdir)/src/osx/cocoa/button.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/button.mm
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dcmemory.cpp
+corelib_osx_cocoa_checkbox.o: $(srcdir)/src/osx/cocoa/checkbox.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/checkbox.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_dcscreen.o: $(srcdir)/src/gtk/dcscreen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/dcscreen.cpp
+corelib_osx_cocoa_choice.o: $(srcdir)/src/osx/cocoa/choice.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/choice.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_dcscreen.o: $(srcdir)/src/gtk1/dcscreen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/dcscreen.cpp
+corelib_osx_cocoa_dialog.o: $(srcdir)/src/osx/cocoa/dialog.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/dialog.mm
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_dcscreen.o: $(srcdir)/src/msw/dcscreen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dcscreen.cpp
+corelib_osx_cocoa_dirdlg.o: $(srcdir)/src/osx/cocoa/dirdlg.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/dirdlg.mm
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_dcscreen.o: $(srcdir)/src/msw/dcscreen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dcscreen.cpp
+corelib_osx_cocoa_evtloop.o: $(srcdir)/src/osx/cocoa/evtloop.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/evtloop.mm
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_dcscreen.o: $(srcdir)/src/x11/dcscreen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/dcscreen.cpp
+corelib_osx_cocoa_filedlg.o: $(srcdir)/src/osx/cocoa/filedlg.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/filedlg.mm
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_dcscreen.o: $(srcdir)/src/mgl/dcscreen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/dcscreen.cpp
+corelib_osx_cocoa_gauge.o: $(srcdir)/src/osx/cocoa/gauge.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/gauge.mm
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dcscreen.o: $(srcdir)/src/dfb/dcscreen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/dcscreen.cpp
+corelib_osx_cocoa_listbox.o: $(srcdir)/src/osx/cocoa/listbox.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/listbox.mm
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_dcscreen.o: $(srcdir)/src/motif/dcscreen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/dcscreen.cpp
+corelib_osx_cocoa_menu.o: $(srcdir)/src/osx/cocoa/menu.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/menu.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
+corelib_osx_cocoa_menuitem.o: $(srcdir)/src/osx/cocoa/menuitem.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/menuitem.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
+corelib_osx_cocoa_msgdlg.o: $(srcdir)/src/osx/cocoa/msgdlg.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/msgdlg.mm
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_dcscreen.o: $(srcdir)/src/cocoa/dcscreen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/dcscreen.cpp
+corelib_cocoa_nonownedwnd.o: $(srcdir)/src/osx/cocoa/nonownedwnd.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/nonownedwnd.mm
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dcscreen.o: $(srcdir)/src/os2/dcscreen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dcscreen.cpp
+corelib_osx_cocoa_notebook.o: $(srcdir)/src/osx/cocoa/notebook.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/notebook.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_dnd.o: $(srcdir)/src/gtk/dnd.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/dnd.cpp
+corelib_osx_cocoa_radiobut.o: $(srcdir)/src/osx/cocoa/radiobut.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/radiobut.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_dnd.o: $(srcdir)/src/gtk1/dnd.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/dnd.cpp
+corelib_osx_cocoa_scrolbar.o: $(srcdir)/src/osx/cocoa/scrolbar.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/scrolbar.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_dnd.o: $(srcdir)/src/osx/carbon/dnd.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dnd.cpp
+corelib_osx_cocoa_slider.o: $(srcdir)/src/osx/cocoa/slider.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/slider.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_dnd.o: $(srcdir)/src/osx/carbon/dnd.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dnd.cpp
+corelib_osx_cocoa_spinbutt.o: $(srcdir)/src/osx/cocoa/spinbutt.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/spinbutt.mm
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dnd.o: $(srcdir)/src/os2/dnd.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dnd.cpp
+corelib_cocoa_srchctrl.o: $(srcdir)/src/osx/cocoa/srchctrl.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/srchctrl.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_filectrl.o: $(srcdir)/src/gtk/filectrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/filectrl.cpp
+corelib_osx_cocoa_statbox.o: $(srcdir)/src/osx/cocoa/statbox.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/statbox.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_font.o: $(srcdir)/src/gtk/font.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/font.cpp
+corelib_cocoa_statline.o: $(srcdir)/src/osx/cocoa/statline.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/statline.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_font.o: $(srcdir)/src/gtk1/font.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/font.cpp
+corelib_osx_cocoa_stattext.o: $(srcdir)/src/osx/cocoa/stattext.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/stattext.mm
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_font.o: $(srcdir)/src/msw/font.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/font.cpp
+corelib_osx_cocoa_textctrl.o: $(srcdir)/src/osx/cocoa/textctrl.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/textctrl.mm
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_font.o: $(srcdir)/src/msw/font.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/font.cpp
+corelib_cocoa_tglbtn.o: $(srcdir)/src/osx/cocoa/tglbtn.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/tglbtn.mm
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_font.o: $(srcdir)/src/x11/font.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/font.cpp
+corelib_osx_cocoa_toolbar.o: $(srcdir)/src/osx/cocoa/toolbar.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/toolbar.mm
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_font.o: $(srcdir)/src/mgl/font.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/font.cpp
+corelib_osx_cocoa_tooltip.o: $(srcdir)/src/osx/cocoa/tooltip.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/tooltip.mm
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_font.o: $(srcdir)/src/dfb/font.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/font.cpp
+corelib_osx_cocoa_window.o: $(srcdir)/src/osx/cocoa/window.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/window.mm
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_font.o: $(srcdir)/src/motif/font.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/font.cpp
+corelib_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSBox.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_font.o: $(srcdir)/src/osx/carbon/font.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
+corelib_NSButton.o: $(srcdir)/src/cocoa/NSButton.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSButton.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_font.o: $(srcdir)/src/osx/carbon/font.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
+corelib_NSControl.o: $(srcdir)/src/cocoa/NSControl.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSControl.mm
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_font.o: $(srcdir)/src/cocoa/font.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/font.mm
+corelib_NSMenu.o: $(srcdir)/src/cocoa/NSMenu.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSMenu.mm
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_font.o: $(srcdir)/src/os2/font.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/font.cpp
+corelib_NSPanel.o: $(srcdir)/src/cocoa/NSPanel.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSPanel.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/gsockgtk.cpp
+corelib_NSScroller.o: $(srcdir)/src/cocoa/NSScroller.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSScroller.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gsockgtk.o: $(srcdir)/src/gtk1/gsockgtk.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/gsockgtk.cpp
+corelib_NSSlider.o: $(srcdir)/src/cocoa/NSSlider.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSSlider.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_minifram.o: $(srcdir)/src/gtk/minifram.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/minifram.cpp
+corelib_NSTabView.o: $(srcdir)/src/cocoa/NSTabView.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSTabView.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_minifram.o: $(srcdir)/src/gtk1/minifram.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/minifram.cpp
+corelib_NSTableView.o: $(srcdir)/src/cocoa/NSTableView.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSTableView.mm
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_minifram.o: $(srcdir)/src/msw/minifram.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
+corelib_NSTextField.o: $(srcdir)/src/cocoa/NSTextField.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSTextField.mm
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_minifram.o: $(srcdir)/src/msw/minifram.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
+corelib_NSView.o: $(srcdir)/src/cocoa/NSView.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSView.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_minifram.o: $(srcdir)/src/osx/minifram.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
+corelib_NSWindow.o: $(srcdir)/src/cocoa/NSWindow.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSWindow.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_minifram.o: $(srcdir)/src/osx/minifram.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
+corelib_ObjcRef.o: $(srcdir)/src/cocoa/ObjcRef.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/ObjcRef.mm
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_minifram.o: $(srcdir)/src/x11/minifram.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/minifram.cpp
+corelib_cocoa_app.o: $(srcdir)/src/cocoa/app.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/app.mm
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_minifram.o: $(srcdir)/src/motif/minifram.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/minifram.cpp
+corelib_cocoa_bitmap.o: $(srcdir)/src/cocoa/bitmap.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/bitmap.mm
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_minifram.o: $(srcdir)/src/os2/minifram.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/minifram.cpp
+corelib_src_cocoa_bmpbuttn.o: $(srcdir)/src/cocoa/bmpbuttn.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/bmpbuttn.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_pen.o: $(srcdir)/src/gtk/pen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/pen.cpp
+corelib_cocoa_brush.o: $(srcdir)/src/cocoa/brush.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/brush.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_pen.o: $(srcdir)/src/gtk1/pen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/pen.cpp
+corelib_src_cocoa_button.o: $(srcdir)/src/cocoa/button.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/button.mm
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_pen.o: $(srcdir)/src/x11/pen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
+corelib_src_cocoa_checkbox.o: $(srcdir)/src/cocoa/checkbox.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/checkbox.mm
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_pen.o: $(srcdir)/src/x11/pen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
+corelib_cocoa_checklst.o: $(srcdir)/src/cocoa/checklst.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/checklst.mm
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_pen.o: $(srcdir)/src/msw/pen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/pen.cpp
+corelib_src_cocoa_choice.o: $(srcdir)/src/cocoa/choice.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/choice.mm
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_pen.o: $(srcdir)/src/msw/pen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/pen.cpp
+corelib_cocoa_clipbrd.o: $(srcdir)/src/cocoa/clipbrd.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/clipbrd.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_pen.o: $(srcdir)/src/osx/pen.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
+corelib_cocoa_colordlg.o: $(srcdir)/src/cocoa/colordlg.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/colordlg.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_pen.o: $(srcdir)/src/osx/pen.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
+corelib_cocoa_colour.o: $(srcdir)/src/cocoa/colour.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/colour.mm
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_pen.o: $(srcdir)/src/mgl/pen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/pen.cpp
+corelib_cocoa_combobox.o: $(srcdir)/src/cocoa/combobox.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/combobox.mm
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_pen.o: $(srcdir)/src/dfb/pen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/pen.cpp
+corelib_cocoa_control.o: $(srcdir)/src/cocoa/control.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/control.mm
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_pen.o: $(srcdir)/src/cocoa/pen.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/pen.mm
+corelib_cocoa_cursor.o: $(srcdir)/src/cocoa/cursor.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/cursor.mm
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_pen.o: $(srcdir)/src/os2/pen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/pen.cpp
+corelib_cocoa_data.o: $(srcdir)/src/cocoa/data.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/data.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_popupwin.o: $(srcdir)/src/gtk/popupwin.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/popupwin.cpp
+corelib_cocoa_dataobj.o: $(srcdir)/src/cocoa/dataobj.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/dataobj.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_popupwin.o: $(srcdir)/src/gtk1/popupwin.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/popupwin.cpp
+corelib_cocoa_dc.o: $(srcdir)/src/cocoa/dc.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/dc.mm
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_popupwin.o: $(srcdir)/src/msw/popupwin.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/popupwin.cpp
+corelib_cocoa_dcclient.o: $(srcdir)/src/cocoa/dcclient.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/dcclient.mm
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_popupwin.o: $(srcdir)/src/msw/popupwin.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/popupwin.cpp
+corelib_cocoa_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/dcmemory.mm
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_popupwin.o: $(srcdir)/src/x11/popupwin.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/popupwin.cpp
+corelib_cocoa_dcscreen.o: $(srcdir)/src/cocoa/dcscreen.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/dcscreen.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_popupwin.o: $(srcdir)/src/motif/popupwin.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/popupwin.cpp
+corelib_src_cocoa_dialog.o: $(srcdir)/src/cocoa/dialog.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/dialog.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
+corelib_src_cocoa_dirdlg.o: $(srcdir)/src/cocoa/dirdlg.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/dirdlg.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
+corelib_cocoa_display.o: $(srcdir)/src/cocoa/display.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/display.mm
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_popupwin.o: $(srcdir)/src/os2/popupwin.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/popupwin.cpp
+corelib_drawer.o: $(srcdir)/src/cocoa/drawer.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/drawer.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_private.o: $(srcdir)/src/gtk/private.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/private.cpp
+corelib_src_cocoa_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/evtloop.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_region.o: $(srcdir)/src/gtk/region.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/region.cpp
+corelib_src_cocoa_filedlg.o: $(srcdir)/src/cocoa/filedlg.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/filedlg.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_region.o: $(srcdir)/src/gtk1/region.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/region.cpp
+corelib_cocoa_font.o: $(srcdir)/src/cocoa/font.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/font.mm
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_region.o: $(srcdir)/src/x11/region.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/region.cpp
+corelib_cocoa_fontdlg.o: $(srcdir)/src/cocoa/fontdlg.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/fontdlg.mm
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_region.o: $(srcdir)/src/x11/region.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/region.cpp
+corelib_cocoa_fontenum.o: $(srcdir)/src/cocoa/fontenum.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/fontenum.mm
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_region.o: $(srcdir)/src/msw/region.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/region.cpp
+corelib_cocoa_fontutil.o: $(srcdir)/src/cocoa/fontutil.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/fontutil.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_region.o: $(srcdir)/src/msw/region.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/region.cpp
+corelib_cocoa_frame.o: $(srcdir)/src/cocoa/frame.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/frame.mm
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_region.o: $(srcdir)/src/mgl/region.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/region.cpp
+corelib_src_cocoa_gauge.o: $(srcdir)/src/cocoa/gauge.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/gauge.mm
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_region.o: $(srcdir)/src/dfb/region.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/region.cpp
+corelib_cocoa_icon.o: $(srcdir)/src/cocoa/icon.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/icon.mm
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_region.o: $(srcdir)/src/osx/carbon/region.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/region.cpp
+corelib_src_cocoa_listbox.o: $(srcdir)/src/cocoa/listbox.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/listbox.mm
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_region.o: $(srcdir)/src/cocoa/region.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/region.mm
+corelib_cocoa_main.o: $(srcdir)/src/cocoa/main.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/main.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_region.o: $(srcdir)/src/os2/region.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/region.cpp
+corelib_mbarman.o: $(srcdir)/src/cocoa/mbarman.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/mbarman.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_renderer.o: $(srcdir)/src/gtk/renderer.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/renderer.cpp
+corelib_cocoa_mdi.o: $(srcdir)/src/cocoa/mdi.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/mdi.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_renderer.o: $(srcdir)/src/gtk1/renderer.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/renderer.cpp
+corelib_src_cocoa_menu.o: $(srcdir)/src/cocoa/menu.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/menu.mm
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_renderer.o: $(srcdir)/src/msw/renderer.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/renderer.cpp
+corelib_src_cocoa_menuitem.o: $(srcdir)/src/cocoa/menuitem.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/menuitem.mm
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_renderer.o: $(srcdir)/src/msw/renderer.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/renderer.cpp
+corelib_src_cocoa_msgdlg.o: $(srcdir)/src/cocoa/msgdlg.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/msgdlg.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
+corelib_src_cocoa_notebook.o: $(srcdir)/src/cocoa/notebook.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/notebook.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
+corelib_cocoa_pen.o: $(srcdir)/src/cocoa/pen.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/pen.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_settings.o: $(srcdir)/src/gtk/settings.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/settings.cpp
+corelib_cocoa_radiobox.o: $(srcdir)/src/cocoa/radiobox.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/radiobox.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_settings.o: $(srcdir)/src/gtk1/settings.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/settings.cpp
+corelib_src_cocoa_radiobut.o: $(srcdir)/src/cocoa/radiobut.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/radiobut.mm
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_settings.o: $(srcdir)/src/msw/settings.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/settings.cpp
+corelib_cocoa_region.o: $(srcdir)/src/cocoa/region.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/region.mm
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_settings.o: $(srcdir)/src/msw/settings.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/settings.cpp
+corelib_src_cocoa_scrolbar.o: $(srcdir)/src/cocoa/scrolbar.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/scrolbar.mm
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_settings.o: $(srcdir)/src/x11/settings.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/settings.cpp
+corelib_cocoa_settings.o: $(srcdir)/src/cocoa/settings.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/settings.mm
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_settings.o: $(srcdir)/src/mgl/settings.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/settings.cpp
+corelib_src_cocoa_slider.o: $(srcdir)/src/cocoa/slider.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/slider.mm
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_settings.o: $(srcdir)/src/dfb/settings.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/settings.cpp
+corelib_sound.o: $(srcdir)/src/cocoa/sound.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/sound.mm
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_settings.o: $(srcdir)/src/motif/settings.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/settings.cpp
+corelib_src_cocoa_spinbutt.o: $(srcdir)/src/cocoa/spinbutt.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/spinbutt.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
+corelib_cocoa_statbmp.o: $(srcdir)/src/cocoa/statbmp.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/statbmp.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
+corelib_src_cocoa_statbox.o: $(srcdir)/src/cocoa/statbox.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/statbox.mm
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_settings.o: $(srcdir)/src/cocoa/settings.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/settings.mm
+corelib_statline2.o: $(srcdir)/src/cocoa/statline2.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/statline2.mm
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_settings.o: $(srcdir)/src/os2/settings.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/settings.cpp
+corelib_src_cocoa_stattext.o: $(srcdir)/src/cocoa/stattext.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/stattext.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_timer.o: $(srcdir)/src/gtk/timer.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/timer.cpp
+corelib_src_cocoa_textctrl.o: $(srcdir)/src/cocoa/textctrl.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/textctrl.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_timer.o: $(srcdir)/src/gtk1/timer.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/timer.cpp
+corelib_cocoa_timer.o: $(srcdir)/src/cocoa/timer.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/timer.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_timer.o: $(srcdir)/src/osx/core/timer.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
+corelib_src_cocoa_toolbar.o: $(srcdir)/src/cocoa/toolbar.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/toolbar.mm
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_timer.o: $(srcdir)/src/osx/core/timer.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
+corelib_src_cocoa_tooltip.o: $(srcdir)/src/cocoa/tooltip.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/tooltip.mm
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_timer.o: $(srcdir)/src/generic/timer.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
+corelib_cocoa_toplevel.o: $(srcdir)/src/cocoa/toplevel.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/toplevel.mm
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_timer.o: $(srcdir)/src/generic/timer.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
+corelib_src_cocoa_utils.o: $(srcdir)/src/cocoa/utils.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/utils.mm
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_timer.o: $(srcdir)/src/generic/timer.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
+corelib_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/utilsexc.mm
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_timer.o: $(srcdir)/src/motif/timer.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/timer.cpp
+corelib_src_cocoa_window.o: $(srcdir)/src/cocoa/window.mm $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/window.mm
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_timer.o: $(srcdir)/src/cocoa/timer.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/timer.mm
+corelib_os2_accel.o: $(srcdir)/src/os2/accel.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/accel.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_timer.o: $(srcdir)/src/os2/timer.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/timer.cpp
+corelib_os2_app.o: $(srcdir)/src/os2/app.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/app.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_tooltip.o: $(srcdir)/src/gtk/tooltip.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/tooltip.cpp
+corelib_os2_bitmap.o: $(srcdir)/src/os2/bitmap.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/bitmap.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_tooltip.o: $(srcdir)/src/gtk1/tooltip.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/tooltip.cpp
+corelib_os2_bmpbuttn.o: $(srcdir)/src/os2/bmpbuttn.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/bmpbuttn.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp
+corelib_os2_brush.o: $(srcdir)/src/os2/brush.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/brush.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp
+corelib_os2_button.o: $(srcdir)/src/os2/button.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/button.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_tooltip.o: $(srcdir)/src/osx/carbon/tooltip.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/tooltip.cpp
+corelib_os2_checkbox.o: $(srcdir)/src/os2/checkbox.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/checkbox.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_tooltip.o: $(srcdir)/src/osx/cocoa/tooltip.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/tooltip.mm
+corelib_os2_checklst.o: $(srcdir)/src/os2/checklst.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/checklst.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_tooltip.o: $(srcdir)/src/cocoa/tooltip.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/tooltip.mm
+corelib_os2_choice.o: $(srcdir)/src/os2/choice.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/choice.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_tooltip.o: $(srcdir)/src/os2/tooltip.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/tooltip.cpp
+corelib_os2_clipbrd.o: $(srcdir)/src/os2/clipbrd.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/clipbrd.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_toplevel.o: $(srcdir)/src/gtk/toplevel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/toplevel.cpp
+corelib_os2_colour.o: $(srcdir)/src/os2/colour.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/colour.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_toplevel.o: $(srcdir)/src/gtk1/toplevel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/toplevel.cpp
+corelib_os2_combobox.o: $(srcdir)/src/os2/combobox.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/combobox.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
+corelib_os2_control.o: $(srcdir)/src/os2/control.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/control.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
+corelib_os2_cursor.o: $(srcdir)/src/os2/cursor.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/cursor.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_toplevel.o: $(srcdir)/src/x11/toplevel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/toplevel.cpp
+corelib_os2_data.o: $(srcdir)/src/os2/data.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/data.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_toplevel.o: $(srcdir)/src/mgl/toplevel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/toplevel.cpp
+corelib_os2_dataobj.o: $(srcdir)/src/os2/dataobj.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dataobj.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_toplevel.o: $(srcdir)/src/dfb/toplevel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/toplevel.cpp
+corelib_os2_dc.o: $(srcdir)/src/os2/dc.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dc.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_toplevel.o: $(srcdir)/src/motif/toplevel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/toplevel.cpp
+corelib_os2_dcclient.o: $(srcdir)/src/os2/dcclient.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dcclient.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_toplevel.o: $(srcdir)/src/cocoa/toplevel.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/toplevel.mm
+corelib_os2_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dcmemory.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_toplevel.o: $(srcdir)/src/os2/toplevel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/toplevel.cpp
+corelib_os2_dcprint.o: $(srcdir)/src/os2/dcprint.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dcprint.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_utilsgtk.o: $(srcdir)/src/gtk/utilsgtk.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/utilsgtk.cpp
+corelib_os2_dcscreen.o: $(srcdir)/src/os2/dcscreen.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dcscreen.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_utilsgtk.o: $(srcdir)/src/gtk1/utilsgtk.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/utilsgtk.cpp
+corelib_os2_dialog.o: $(srcdir)/src/os2/dialog.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dialog.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_win_gtk.o: $(srcdir)/src/gtk/win_gtk.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/win_gtk.cpp
+corelib_os2_dnd.o: $(srcdir)/src/os2/dnd.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dnd.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_win_gtk.o: $(srcdir)/src/gtk1/win_gtk.c $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CCC) -c -o $@ $(CORELIB_CFLAGS) $(srcdir)/src/gtk1/win_gtk.c
+corelib_os2_evtloop.o: $(srcdir)/src/os2/evtloop.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/evtloop.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_window.o: $(srcdir)/src/gtk/window.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/window.cpp
+corelib_os2_filedlg.o: $(srcdir)/src/os2/filedlg.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/filedlg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_window.o: $(srcdir)/src/gtk1/window.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/window.cpp
+corelib_os2_font.o: $(srcdir)/src/os2/font.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/font.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_window.o: $(srcdir)/src/msw/window.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/window.cpp
+corelib_os2_fontdlg.o: $(srcdir)/src/os2/fontdlg.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/fontdlg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_window.o: $(srcdir)/src/msw/window.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/window.cpp
+corelib_os2_fontenum.o: $(srcdir)/src/os2/fontenum.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/fontenum.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_window.o: $(srcdir)/src/x11/window.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/window.cpp
+corelib_os2_fontutil.o: $(srcdir)/src/os2/fontutil.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/fontutil.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_window.o: $(srcdir)/src/mgl/window.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/window.cpp
+corelib_os2_frame.o: $(srcdir)/src/os2/frame.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/frame.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_window.o: $(srcdir)/src/dfb/window.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/window.cpp
+corelib_os2_gauge.o: $(srcdir)/src/os2/gauge.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/gauge.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_window.o: $(srcdir)/src/motif/window.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/window.cpp
+corelib_os2_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/gdiimage.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_window.o: $(srcdir)/src/osx/carbon/window.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/window.cpp
+corelib_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/gsockpm.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_window.o: $(srcdir)/src/osx/cocoa/window.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/window.mm
+corelib_os2_helpwin.o: $(srcdir)/src/os2/helpwin.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/helpwin.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_window.o: $(srcdir)/src/cocoa/window.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/window.mm
+corelib_os2_icon.o: $(srcdir)/src/os2/icon.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/icon.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_window.o: $(srcdir)/src/os2/window.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/window.cpp
+corelib_os2_iniconf.o: $(srcdir)/src/os2/iniconf.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/iniconf.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_data.o: $(srcdir)/src/gtk1/data.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/data.cpp
+corelib_os2_listbox.o: $(srcdir)/src/os2/listbox.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/listbox.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_data.o: $(srcdir)/src/msw/data.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/data.cpp
+corelib_os2_main.o: $(srcdir)/src/os2/main.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/main.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_data.o: $(srcdir)/src/msw/data.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/data.cpp
+corelib_os2_menu.o: $(srcdir)/src/os2/menu.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/menu.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_data.o: $(srcdir)/src/x11/data.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/data.cpp
+corelib_os2_menuitem.o: $(srcdir)/src/os2/menuitem.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/menuitem.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_data.o: $(srcdir)/src/mgl/data.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/data.cpp
+corelib_os2_metafile.o: $(srcdir)/src/os2/metafile.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/metafile.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_data.o: $(srcdir)/src/motif/data.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/data.cpp
+corelib_os2_minifram.o: $(srcdir)/src/os2/minifram.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/minifram.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_data.o: $(srcdir)/src/cocoa/data.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/data.cpp
+corelib_os2_msgdlg.o: $(srcdir)/src/os2/msgdlg.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/msgdlg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_data.o: $(srcdir)/src/os2/data.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/data.cpp
+corelib_os2_nativdlg.o: $(srcdir)/src/os2/nativdlg.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/nativdlg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_palette.o: $(srcdir)/src/x11/palette.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
+corelib_os2_notebook.o: $(srcdir)/src/os2/notebook.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/notebook.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_palette.o: $(srcdir)/src/x11/palette.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
+corelib_os2_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/ownerdrw.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_palette.o: $(srcdir)/src/msw/palette.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/palette.cpp
+corelib_os2_palette.o: $(srcdir)/src/os2/palette.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/palette.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_palette.o: $(srcdir)/src/msw/palette.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/palette.cpp
+corelib_os2_pen.o: $(srcdir)/src/os2/pen.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/pen.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_palette.o: $(srcdir)/src/osx/palette.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
+corelib_os2_popupwin.o: $(srcdir)/src/os2/popupwin.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/popupwin.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_palette.o: $(srcdir)/src/osx/palette.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
+corelib_os2_print.o: $(srcdir)/src/os2/print.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/print.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_palette.o: $(srcdir)/src/mgl/palette.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/palette.cpp
+corelib_os2_radiobox.o: $(srcdir)/src/os2/radiobox.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/radiobox.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_palette.o: $(srcdir)/src/os2/palette.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/palette.cpp
+corelib_os2_radiobut.o: $(srcdir)/src/os2/radiobut.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/radiobut.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
+corelib_os2_region.o: $(srcdir)/src/os2/region.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/region.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
+corelib_os2_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/scrolbar.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_dcprint.o: $(srcdir)/src/msw/dcprint.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dcprint.cpp
+corelib_os2_settings.o: $(srcdir)/src/os2/settings.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/settings.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_dcprint.o: $(srcdir)/src/msw/dcprint.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dcprint.cpp
+corelib_os2_slider.o: $(srcdir)/src/os2/slider.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/slider.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
+corelib_os2_spinbutt.o: $(srcdir)/src/os2/spinbutt.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/spinbutt.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
+corelib_os2_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/spinctrl.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dcprint.o: $(srcdir)/src/os2/dcprint.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dcprint.cpp
+corelib_os2_statbmp.o: $(srcdir)/src/os2/statbmp.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/statbmp.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_dib.o: $(srcdir)/src/msw/dib.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dib.cpp
+corelib_os2_statbox.o: $(srcdir)/src/os2/statbox.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/statbox.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_dib.o: $(srcdir)/src/msw/dib.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dib.cpp
+corelib_os2_statline.o: $(srcdir)/src/os2/statline.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/statline.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_display.o: $(srcdir)/src/msw/display.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/display.cpp
+corelib_os2_stattext.o: $(srcdir)/src/os2/stattext.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/stattext.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_display.o: $(srcdir)/src/msw/display.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/display.cpp
+corelib_os2_tabctrl.o: $(srcdir)/src/os2/tabctrl.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/tabctrl.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_display.o: $(srcdir)/src/osx/core/display.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
+corelib_os2_textctrl.o: $(srcdir)/src/os2/textctrl.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/textctrl.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_display.o: $(srcdir)/src/osx/core/display.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
+corelib_os2_textentry.o: $(srcdir)/src/os2/textentry.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/textentry.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_display.o: $(srcdir)/src/cocoa/display.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/display.mm
+corelib_os2_tglbtn.o: $(srcdir)/src/os2/tglbtn.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/tglbtn.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp
+corelib_os2_timer.o: $(srcdir)/src/os2/timer.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/timer.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp
+corelib_os2_toolbar.o: $(srcdir)/src/os2/toolbar.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/toolbar.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp
+corelib_os2_tooltip.o: $(srcdir)/src/os2/tooltip.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/tooltip.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp
+corelib_os2_toplevel.o: $(srcdir)/src/os2/toplevel.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/toplevel.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/gdiimage.cpp
+corelib_os2_utilsgui.o: $(srcdir)/src/os2/utilsgui.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/utilsgui.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp
+corelib_os2_window.o: $(srcdir)/src/os2/window.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/window.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp
+corelib_univ_bmpbuttn.o: $(srcdir)/src/univ/bmpbuttn.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/bmpbuttn.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
+corelib_univ_button.o: $(srcdir)/src/univ/button.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/button.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
+corelib_univ_checkbox.o: $(srcdir)/src/univ/checkbox.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/checkbox.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp
+corelib_univ_checklst.o: $(srcdir)/src/univ/checklst.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/checklst.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp
+corelib_univ_choice.o: $(srcdir)/src/univ/choice.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/choice.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_graphics.o: $(srcdir)/src/msw/graphics.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp
+corelib_univ_combobox.o: $(srcdir)/src/univ/combobox.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/combobox.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_graphics.o: $(srcdir)/src/msw/graphics.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp
+corelib_univ_control.o: $(srcdir)/src/univ/control.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/control.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
+corelib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/ctrlrend.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
+corelib_univ_dialog.o: $(srcdir)/src/univ/dialog.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/dialog.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/dropsrc.cpp
+corelib_framuniv.o: $(srcdir)/src/univ/framuniv.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/framuniv.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/dropsrc.cpp
+corelib_univ_gauge.o: $(srcdir)/src/univ/gauge.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/gauge.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_droptgt.o: $(srcdir)/src/msw/ole/droptgt.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/droptgt.cpp
+corelib_inpcons.o: $(srcdir)/src/univ/inpcons.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/inpcons.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_droptgt.o: $(srcdir)/src/msw/ole/droptgt.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/droptgt.cpp
+corelib_inphand.o: $(srcdir)/src/univ/inphand.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/inphand.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp
+corelib_univ_listbox.o: $(srcdir)/src/univ/listbox.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/listbox.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp
+corelib_univ_menu.o: $(srcdir)/src/univ/menu.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/menu.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_printdlg.o: $(srcdir)/src/msw/printdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/printdlg.cpp
+corelib_univ_notebook.o: $(srcdir)/src/univ/notebook.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/notebook.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_printdlg.o: $(srcdir)/src/msw/printdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/printdlg.cpp
+corelib_univ_radiobox.o: $(srcdir)/src/univ/radiobox.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/radiobox.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_printdlg.o: $(srcdir)/src/osx/carbon/printdlg.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/printdlg.cpp
+corelib_univ_radiobut.o: $(srcdir)/src/univ/radiobut.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/radiobut.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_printdlg.o: $(srcdir)/src/osx/carbon/printdlg.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/printdlg.cpp
+corelib_scrarrow.o: $(srcdir)/src/univ/scrarrow.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/scrarrow.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_printwin.o: $(srcdir)/src/msw/printwin.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/printwin.cpp
+corelib_univ_scrolbar.o: $(srcdir)/src/univ/scrolbar.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/scrolbar.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_printwin.o: $(srcdir)/src/msw/printwin.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/printwin.cpp
+corelib_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/scrthumb.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp
+corelib_settingsuniv.o: $(srcdir)/src/univ/settingsuniv.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/settingsuniv.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp
+corelib_univ_slider.o: $(srcdir)/src/univ/slider.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/slider.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_utilsgui.o: $(srcdir)/src/os2/utilsgui.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/utilsgui.cpp
+corelib_univ_spinbutt.o: $(srcdir)/src/univ/spinbutt.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/spinbutt.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/uxtheme.cpp
+corelib_univ_statbmp.o: $(srcdir)/src/univ/statbmp.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/statbmp.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/uxtheme.cpp
+corelib_univ_statbox.o: $(srcdir)/src/univ/statbox.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/statbox.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_helpchm.o: $(srcdir)/src/msw/helpchm.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/helpchm.cpp
+corelib_univ_statline.o: $(srcdir)/src/univ/statline.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/statline.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_helpwin.o: $(srcdir)/src/msw/helpwin.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/helpwin.cpp
+corelib_univ_stattext.o: $(srcdir)/src/univ/stattext.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/stattext.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_helpwin.o: $(srcdir)/src/os2/helpwin.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/helpwin.cpp
+corelib_univ_statusbr.o: $(srcdir)/src/univ/statusbr.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/statusbr.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/automtn.cpp
+corelib_stdrend.o: $(srcdir)/src/univ/stdrend.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/stdrend.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/uuid.cpp
+corelib_univ_textctrl.o: $(srcdir)/src/univ/textctrl.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/textctrl.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_accel.o: $(srcdir)/src/osx/accel.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/accel.cpp
+corelib_univ_tglbtn.o: $(srcdir)/src/univ/tglbtn.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/tglbtn.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_accel.o: $(srcdir)/src/osx/accel.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/accel.cpp
+corelib_theme.o: $(srcdir)/src/univ/theme.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/theme.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+corelib_univ_toolbar.o: $(srcdir)/src/univ/toolbar.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/toolbar.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+corelib_topluniv.o: $(srcdir)/src/univ/topluniv.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/topluniv.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+corelib_winuniv.o: $(srcdir)/src/univ/winuniv.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/winuniv.cpp
-@COND_USE_GUI_1_WXUNIV_1@corelib_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+corelib_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/themes/gtk.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/motif/accel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/accel.cpp
+corelib_metal.o: $(srcdir)/src/univ/themes/metal.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/themes/metal.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/msw/accel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
+corelib_mono.o: $(srcdir)/src/univ/themes/mono.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/themes/mono.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/msw/accel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
+corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/themes/win32.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/os2/accel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/accel.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_app.o: $(srcdir)/src/gtk/app.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/app.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_tabctrl_osx.o: $(srcdir)/src/osx/tabctrl_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/tabctrl_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.c $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CCC) -c -o $@ $(CORELIB_CFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.c
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_tabctrl_osx.o: $(srcdir)/src/osx/tabctrl_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/tabctrl_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/bitmap.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_brush.o: $(srcdir)/src/gtk/brush.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/brush.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_clipbrd.o: $(srcdir)/src/gtk/clipbrd.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/clipbrd.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_colour.o: $(srcdir)/src/gtk/colour.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/colour.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_cursor.o: $(srcdir)/src/gtk/cursor.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/cursor.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_dataobj.o: $(srcdir)/src/gtk/dataobj.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/dataobj.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_dc.o: $(srcdir)/src/gtk/dc.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/dc.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_dcclient.o: $(srcdir)/src/gtk/dcclient.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/dcclient.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_dcmemory.o: $(srcdir)/src/gtk/dcmemory.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/dcmemory.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_dcscreen.o: $(srcdir)/src/gtk/dcscreen.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/dcscreen.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_dnd.o: $(srcdir)/src/gtk/dnd.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/dnd.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/evtloop.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_filectrl.o: $(srcdir)/src/gtk/filectrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/filectrl.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_hid.o: $(srcdir)/src/osx/core/hid.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_font.o: $(srcdir)/src/gtk/font.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/font.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_hid.o: $(srcdir)/src/osx/core/hid.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/gsockgtk.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@corelib_hid.o: $(srcdir)/src/osx/core/hid.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_minifram.o: $(srcdir)/src/gtk/minifram.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/minifram.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_pen.o: $(srcdir)/src/gtk/pen.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/pen.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_popupwin.o: $(srcdir)/src/gtk/popupwin.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/popupwin.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_private.o: $(srcdir)/src/gtk/private.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/private.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_region.o: $(srcdir)/src/gtk/region.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/region.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@corelib_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_renderer.o: $(srcdir)/src/gtk/renderer.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/renderer.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_nanox.o: $(srcdir)/src/x11/nanox.c $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(CORELIB_CFLAGS) $(srcdir)/src/x11/nanox.c
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_settings.o: $(srcdir)/src/gtk/settings.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/settings.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_reparent.o: $(srcdir)/src/x11/reparent.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/reparent.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_timer.o: $(srcdir)/src/gtk/timer.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/timer.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_tooltip.o: $(srcdir)/src/gtk/tooltip.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/tooltip.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_toplevel.o: $(srcdir)/src/gtk/toplevel.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/toplevel.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mask.o: $(srcdir)/src/generic/mask.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_utilsgtk.o: $(srcdir)/src/gtk/utilsgtk.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/utilsgtk.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_mask.o: $(srcdir)/src/generic/mask.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_win_gtk.o: $(srcdir)/src/gtk/win_gtk.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/win_gtk.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_dirmgl.o: $(srcdir)/src/mgl/dirmgl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/dirmgl.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_window.o: $(srcdir)/src/gtk/window.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/window.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_fontmgr.o: $(srcdir)/src/mgl/fontmgr.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/fontmgr.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_app.o: $(srcdir)/src/gtk1/app.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/app.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_fontmgr.o: $(srcdir)/src/dfb/fontmgr.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/fontmgr.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_bitmap.o: $(srcdir)/src/gtk1/bitmap.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/bitmap.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_nonownedwnd.o: $(srcdir)/src/dfb/nonownedwnd.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/nonownedwnd.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_brush.o: $(srcdir)/src/gtk1/brush.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/brush.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_nonownedwnd.o: $(srcdir)/src/osx/carbon/nonownedwnd.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/nonownedwnd.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_clipbrd.o: $(srcdir)/src/gtk1/clipbrd.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/clipbrd.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_nonownedwnd.o: $(srcdir)/src/osx/cocoa/nonownedwnd.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/nonownedwnd.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_colour.o: $(srcdir)/src/gtk1/colour.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/colour.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_overlay.o: $(srcdir)/src/dfb/overlay.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/overlay.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_cursor.o: $(srcdir)/src/gtk1/cursor.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/cursor.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_data.o: $(srcdir)/src/gtk1/data.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/data.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_dataobj.o: $(srcdir)/src/gtk1/dataobj.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/dataobj.cpp
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_wrapdfb.o: $(srcdir)/src/dfb/wrapdfb.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/wrapdfb.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_dc.o: $(srcdir)/src/gtk1/dc.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/dc.cpp
-@COND_PLATFORM_UNIX_1_USE_GUI_1@corelib_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_UNIX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_dcclient.o: $(srcdir)/src/gtk1/dcclient.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/dcclient.cpp
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@corelib_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_dcmemory.o: $(srcdir)/src/gtk1/dcmemory.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/dcmemory.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_dcscreen.o: $(srcdir)/src/gtk1/dcscreen.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/dcscreen.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_dnd.o: $(srcdir)/src/gtk1/dnd.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/dnd.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_evtloop.o: $(srcdir)/src/gtk1/evtloop.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/evtloop.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_font.o: $(srcdir)/src/gtk1/font.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/font.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_gsockgtk.o: $(srcdir)/src/gtk1/gsockgtk.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/gsockgtk.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_main.o: $(srcdir)/src/gtk1/main.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/main.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_minifram.o: $(srcdir)/src/gtk1/minifram.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/minifram.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_pen.o: $(srcdir)/src/gtk1/pen.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/pen.cpp
-@COND_USE_GUI_1_WXUNIV_1@corelib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_popupwin.o: $(srcdir)/src/gtk1/popupwin.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/popupwin.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_fdrepdlg.o: $(srcdir)/src/msw/fdrepdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/fdrepdlg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_region.o: $(srcdir)/src/gtk1/region.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/region.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_renderer.o: $(srcdir)/src/gtk1/renderer.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/renderer.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_settings.o: $(srcdir)/src/gtk1/settings.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/settings.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_timer.o: $(srcdir)/src/gtk1/timer.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/timer.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_tooltip.o: $(srcdir)/src/gtk1/tooltip.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/tooltip.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_toplevel.o: $(srcdir)/src/gtk1/toplevel.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/toplevel.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_utilsgtk.o: $(srcdir)/src/gtk1/utilsgtk.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/utilsgtk.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_win_gtk.o: $(srcdir)/src/gtk1/win_gtk.c $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CCC) -c -o $@ $(CORELIB_CFLAGS) $(srcdir)/src/gtk1/win_gtk.c
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_window.o: $(srcdir)/src/gtk1/window.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/window.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_x11_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
-@COND_USE_GUI_1_WXUNIV_1@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_x11_brush.o: $(srcdir)/src/x11/brush.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_brush.o: $(srcdir)/src/x11/brush.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_x11_palette.o: $(srcdir)/src/x11/palette.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_palette.o: $(srcdir)/src/x11/palette.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_x11_pen.o: $(srcdir)/src/x11/pen.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_pen.o: $(srcdir)/src/x11/pen.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_x11_region.o: $(srcdir)/src/x11/region.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/region.cpp
-@COND_USE_GUI_1_WXUNIV_1@corelib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_region.o: $(srcdir)/src/x11/region.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/region.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_listctrl.o: $(srcdir)/src/msw/listctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/listctrl.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_listctrl.o: $(srcdir)/src/msw/listctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/listctrl.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_app.o: $(srcdir)/src/msw/app.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/app.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_app.o: $(srcdir)/src/msw/app.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/app.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_brush.o: $(srcdir)/src/msw/brush.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/brush.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_brush.o: $(srcdir)/src/msw/brush.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/brush.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_caret.o: $(srcdir)/src/msw/caret.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/caret.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_caret.o: $(srcdir)/src/msw/caret.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/caret.cpp
-@COND_USE_GUI_1_WXUNIV_1@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/clipbrd.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/clipbrd.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_colour.o: $(srcdir)/src/msw/colour.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/colour.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_colour.o: $(srcdir)/src/msw/colour.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/colour.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_cursor.o: $(srcdir)/src/msw/cursor.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/cursor.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_cursor.o: $(srcdir)/src/msw/cursor.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/cursor.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_data.o: $(srcdir)/src/msw/data.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/data.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_data.o: $(srcdir)/src/msw/data.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/data.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_dc.o: $(srcdir)/src/msw/dc.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dc.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_dc.o: $(srcdir)/src/msw/dc.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dc.cpp
-@COND_USE_GUI_1_WXUNIV_1@corelib_statusbr.o: $(srcdir)/src/univ/statusbr.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/statusbr.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dcclient.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dcclient.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_dcprint.o: $(srcdir)/src/msw/dcprint.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dcprint.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_dcprint.o: $(srcdir)/src/msw/dcprint.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dcprint.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_dcscreen.o: $(srcdir)/src/msw/dcscreen.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dcscreen.cpp
-@COND_USE_GUI_1_WXUNIV_1@corelib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_dcscreen.o: $(srcdir)/src/msw/dcscreen.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dcscreen.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_dialup.o: $(srcdir)/src/msw/dialup.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_dialup.o: $(srcdir)/src/msw/dialup.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_dib.o: $(srcdir)/src/msw/dib.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dib.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_dib.o: $(srcdir)/src/msw/dib.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dib.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_display.o: $(srcdir)/src/msw/display.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/display.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_display.o: $(srcdir)/src/msw/display.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/display.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp
-@COND_USE_GUI_1_WXUNIV_1@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_font.o: $(srcdir)/src/msw/font.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/font.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_font.o: $(srcdir)/src/msw/font.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/font.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp
-@COND_USE_GUI_1_WXUNIV_1@corelib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_bmpbuttn.o: $(srcdir)/src/gtk/bmpbuttn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/bmpbuttn.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_bmpbuttn.o: $(srcdir)/src/gtk1/bmpbuttn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/bmpbuttn.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_bmpbuttn.o: $(srcdir)/src/motif/bmpbuttn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/bmpbuttn.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_bmpbuttn.o: $(srcdir)/src/osx/carbon/bmpbuttn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/bmpbuttn.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_bmpbuttn.o: $(srcdir)/src/osx/cocoa/bmpbuttn.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/bmpbuttn.mm
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_bmpbuttn.o: $(srcdir)/src/cocoa/bmpbuttn.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/bmpbuttn.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_bmpbuttn.o: $(srcdir)/src/os2/bmpbuttn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/bmpbuttn.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_graphics.o: $(srcdir)/src/msw/graphics.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp
-@COND_USE_GUI_1_WXUNIV_1@corelib_bmpbuttn.o: $(srcdir)/src/univ/bmpbuttn.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/bmpbuttn.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_graphics.o: $(srcdir)/src/msw/graphics.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_button.o: $(srcdir)/src/gtk/button.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/button.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_icon.o: $(srcdir)/src/msw/icon.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_button.o: $(srcdir)/src/gtk1/button.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/button.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_icon.o: $(srcdir)/src/msw/icon.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_button.o: $(srcdir)/src/motif/button.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/button.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_button.o: $(srcdir)/src/msw/button.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/button.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_button.o: $(srcdir)/src/msw/button.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/button.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_minifram.o: $(srcdir)/src/msw/minifram.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_button.o: $(srcdir)/src/osx/carbon/button.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/button.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_minifram.o: $(srcdir)/src/msw/minifram.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_button.o: $(srcdir)/src/osx/cocoa/button.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/button.mm
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_ole_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/dataobj.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_button.o: $(srcdir)/src/cocoa/button.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/button.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_ole_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/dataobj.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_button.o: $(srcdir)/src/os2/button.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/button.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/dropsrc.cpp
-@COND_USE_GUI_1_WXUNIV_1@corelib_button.o: $(srcdir)/src/univ/button.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/button.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/dropsrc.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_checkbox.o: $(srcdir)/src/gtk/checkbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/checkbox.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_droptgt.o: $(srcdir)/src/msw/ole/droptgt.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/droptgt.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_checkbox.o: $(srcdir)/src/gtk1/checkbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/checkbox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_droptgt.o: $(srcdir)/src/msw/ole/droptgt.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/droptgt.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_checkbox.o: $(srcdir)/src/motif/checkbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/checkbox.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/checkbox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/checkbox.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_palette.o: $(srcdir)/src/msw/palette.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/palette.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_checkbox.o: $(srcdir)/src/osx/carbon/checkbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/checkbox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_palette.o: $(srcdir)/src/msw/palette.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/palette.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_checkbox.o: $(srcdir)/src/osx/cocoa/checkbox.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/checkbox.mm
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_pen.o: $(srcdir)/src/msw/pen.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/pen.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_checkbox.o: $(srcdir)/src/cocoa/checkbox.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/checkbox.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_pen.o: $(srcdir)/src/msw/pen.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/pen.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_checkbox.o: $(srcdir)/src/os2/checkbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/checkbox.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_popupwin.o: $(srcdir)/src/msw/popupwin.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/popupwin.cpp
-@COND_USE_GUI_1_WXUNIV_1@corelib_checkbox.o: $(srcdir)/src/univ/checkbox.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/checkbox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_popupwin.o: $(srcdir)/src/msw/popupwin.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/popupwin.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_checklst.o: $(srcdir)/src/gtk/checklst.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/checklst.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_printdlg.o: $(srcdir)/src/msw/printdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/printdlg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_checklst.o: $(srcdir)/src/gtk1/checklst.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/checklst.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_printdlg.o: $(srcdir)/src/msw/printdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/printdlg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_checklst.o: $(srcdir)/src/motif/checklst.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/checklst.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_printwin.o: $(srcdir)/src/msw/printwin.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/printwin.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_checklst.o: $(srcdir)/src/msw/checklst.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_printwin.o: $(srcdir)/src/msw/printwin.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/printwin.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_checklst.o: $(srcdir)/src/msw/wince/checklst.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/wince/checklst.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_region.o: $(srcdir)/src/msw/region.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/region.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_checklst.o: $(srcdir)/src/cocoa/checklst.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/checklst.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_region.o: $(srcdir)/src/msw/region.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/region.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_checklst.o: $(srcdir)/src/os2/checklst.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/checklst.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_renderer.o: $(srcdir)/src/msw/renderer.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/renderer.cpp
-@COND_USE_GUI_1_WXUNIV_1@corelib_checklst.o: $(srcdir)/src/univ/checklst.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/checklst.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_renderer.o: $(srcdir)/src/msw/renderer.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/renderer.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_choice.o: $(srcdir)/src/gtk/choice.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/choice.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_settings.o: $(srcdir)/src/msw/settings.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/settings.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_choice.o: $(srcdir)/src/gtk1/choice.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/choice.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_settings.o: $(srcdir)/src/msw/settings.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/settings.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_choice.o: $(srcdir)/src/motif/choice.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/choice.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_choice.o: $(srcdir)/src/msw/choice.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/choice.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_choice.o: $(srcdir)/src/msw/choice.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/choice.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_choice.o: $(srcdir)/src/osx/carbon/choice.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/choice.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_choice.o: $(srcdir)/src/osx/cocoa/choice.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/choice.mm
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_choice.o: $(srcdir)/src/cocoa/choice.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/choice.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_choice.o: $(srcdir)/src/os2/choice.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/choice.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/uxtheme.cpp
-@COND_USE_GUI_1_WXUNIV_1@corelib_choice.o: $(srcdir)/src/univ/choice.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/choice.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/uxtheme.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_colordlg.o: $(srcdir)/src/gtk/colordlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/colordlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_window.o: $(srcdir)/src/msw/window.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/window.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/colordlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_window.o: $(srcdir)/src/msw/window.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/window.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/colordlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_helpchm.o: $(srcdir)/src/msw/helpchm.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/helpchm.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_colordlg.o: $(srcdir)/src/osx/carbon/colordlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/colordlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_helpwin.o: $(srcdir)/src/msw/helpwin.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/helpwin.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_colordlg.o: $(srcdir)/src/cocoa/colordlg.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/colordlg.mm
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/automtn.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_combobox.o: $(srcdir)/src/gtk/combobox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/combobox.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/uuid.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_combobox.o: $(srcdir)/src/gtk1/combobox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_osx_accel.o: $(srcdir)/src/osx/accel.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/accel.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_combobox.o: $(srcdir)/src/motif/combobox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_osx_accel.o: $(srcdir)/src/osx/accel.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/accel.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_combobox.o: $(srcdir)/src/msw/combobox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_combobox.o: $(srcdir)/src/msw/combobox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_combobox.o: $(srcdir)/src/cocoa/combobox.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/combobox.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_osx_brush.o: $(srcdir)/src/osx/brush.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_combobox.o: $(srcdir)/src/os2/combobox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_osx_brush.o: $(srcdir)/src/osx/brush.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
-@COND_USE_GUI_1_WXUNIV_1@corelib_combobox.o: $(srcdir)/src/univ/combobox.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_control.o: $(srcdir)/src/gtk/control.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_control.o: $(srcdir)/src/gtk1/control.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_control.o: $(srcdir)/src/motif/control.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_control.o: $(srcdir)/src/msw/control.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_control.o: $(srcdir)/src/msw/control.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_control.o: $(srcdir)/src/osx/carbon/control.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_control.o: $(srcdir)/src/osx/carbon/control.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_control.o: $(srcdir)/src/cocoa/control.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/control.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_control.o: $(srcdir)/src/os2/control.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
-@COND_USE_GUI_1_WXUNIV_1@corelib_control.o: $(srcdir)/src/univ/control.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_osx_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_dialog.o: $(srcdir)/src/gtk/dialog.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/dialog.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_osx_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_dialog.o: $(srcdir)/src/gtk1/dialog.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/dialog.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_dialog.o: $(srcdir)/src/motif/dialog.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/dialog.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_dialog.o: $(srcdir)/src/msw/dialog.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dialog.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_osx_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_dialog.o: $(srcdir)/src/msw/dialog.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dialog.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_osx_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_dialog.o: $(srcdir)/src/osx/carbon/dialog.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dialog.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_dialog.o: $(srcdir)/src/osx/cocoa/dialog.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/dialog.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_dialog.o: $(srcdir)/src/cocoa/dialog.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/dialog.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dialog.o: $(srcdir)/src/os2/dialog.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dialog.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp
-@COND_USE_GUI_1_WXUNIV_1@corelib_dialog.o: $(srcdir)/src/univ/dialog.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/dialog.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_dirdlg.o: $(srcdir)/src/gtk/dirdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/dirdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_dirdlg.o: $(srcdir)/src/msw/dirdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dirdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_osx_minifram.o: $(srcdir)/src/osx/minifram.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_dirdlg.o: $(srcdir)/src/msw/dirdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dirdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_osx_minifram.o: $(srcdir)/src/osx/minifram.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_dirdlg.o: $(srcdir)/src/osx/carbon/dirdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dirdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_dirdlg.o: $(srcdir)/src/osx/cocoa/dirdlg.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/dirdlg.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_dirdlg.o: $(srcdir)/src/cocoa/dirdlg.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/dirdlg.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/gtk/filedlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/filedlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/gtk1/filedlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/filedlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_osx_palette.o: $(srcdir)/src/osx/palette.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/motif/filedlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/filedlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_osx_palette.o: $(srcdir)/src/osx/palette.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_osx_pen.o: $(srcdir)/src/osx/pen.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_osx_pen.o: $(srcdir)/src/osx/pen.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/osx/carbon/filedlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/filedlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/osx/cocoa/filedlg.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/filedlg.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/cocoa/filedlg.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/filedlg.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/os2/filedlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/filedlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_fontdlg.o: $(srcdir)/src/gtk/fontdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/fontdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_fontdlg.o: $(srcdir)/src/gtk1/fontdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/fontdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_fontdlg.o: $(srcdir)/src/msw/fontdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/fontdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontdlg.o: $(srcdir)/src/cocoa/fontdlg.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/fontdlg.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_fontdlg.o: $(srcdir)/src/os2/fontdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/fontdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_frame.o: $(srcdir)/src/gtk/frame.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/frame.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_frame.o: $(srcdir)/src/gtk1/frame.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/frame.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_frame.o: $(srcdir)/src/motif/frame.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/frame.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_frame.o: $(srcdir)/src/msw/frame.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/frame.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_frame.o: $(srcdir)/src/msw/frame.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/frame.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_frame.o: $(srcdir)/src/cocoa/frame.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/frame.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_frame.o: $(srcdir)/src/os2/frame.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/frame.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/gtk/gauge.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/gauge.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_tabctrl_osx.o: $(srcdir)/src/osx/tabctrl_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/tabctrl_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/gtk1/gauge.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/gauge.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_tabctrl_osx.o: $(srcdir)/src/osx/tabctrl_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/tabctrl_osx.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/motif/gauge.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/gauge.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/msw/gauge.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/msw/gauge.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/osx/carbon/gauge.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/gauge.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/osx/cocoa/gauge.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/gauge.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/cocoa/gauge.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/gauge.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/os2/gauge.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/gauge.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp
-@COND_USE_GUI_1_WXUNIV_1@corelib_gauge.o: $(srcdir)/src/univ/gauge.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/gauge.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_print.o: $(srcdir)/src/gtk/print.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/print.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_print.o: $(srcdir)/src/os2/print.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/print.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_listbox.o: $(srcdir)/src/gtk/listbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/listbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_listbox.o: $(srcdir)/src/gtk1/listbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/listbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_listbox.o: $(srcdir)/src/motif/listbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/listbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_core_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_listbox.o: $(srcdir)/src/msw/listbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/listbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_core_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_listbox.o: $(srcdir)/src/msw/listbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/listbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_core_colour.o: $(srcdir)/src/osx/core/colour.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_listbox.o: $(srcdir)/src/osx/carbon/listbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/listbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_core_colour.o: $(srcdir)/src/osx/core/colour.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_listbox.o: $(srcdir)/src/osx/cocoa/listbox.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/listbox.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_core_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_listbox.o: $(srcdir)/src/cocoa/listbox.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/listbox.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_core_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_listbox.o: $(srcdir)/src/os2/listbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/listbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_core_display.o: $(srcdir)/src/osx/core/display.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
-@COND_USE_GUI_1_WXUNIV_1@corelib_listbox.o: $(srcdir)/src/univ/listbox.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/listbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_core_display.o: $(srcdir)/src/osx/core/display.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_mdi.o: $(srcdir)/src/gtk/mdi.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/mdi.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_core_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_mdi.o: $(srcdir)/src/gtk1/mdi.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/mdi.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_core_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_mdi.o: $(srcdir)/src/motif/mdi.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/mdi.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_hid.o: $(srcdir)/src/osx/core/hid.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_mdi.o: $(srcdir)/src/msw/mdi.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/mdi.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_hid.o: $(srcdir)/src/osx/core/hid.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_mdi.o: $(srcdir)/src/msw/mdi.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/mdi.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1@corelib_hid.o: $(srcdir)/src/osx/core/hid.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_mdi.o: $(srcdir)/src/osx/carbon/mdi.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/mdi.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_mdi.o: $(srcdir)/src/osx/carbon/mdi.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/mdi.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_mdi.o: $(srcdir)/src/cocoa/mdi.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/mdi.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_core_timer.o: $(srcdir)/src/osx/core/timer.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_menu.o: $(srcdir)/src/gtk/menu.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/menu.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_core_timer.o: $(srcdir)/src/osx/core/timer.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_menu.o: $(srcdir)/src/gtk1/menu.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/menu.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_menu.o: $(srcdir)/src/motif/menu.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/menu.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_menu.o: $(srcdir)/src/msw/menu.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/menu.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1@corelib_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_menu.o: $(srcdir)/src/msw/menu.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/menu.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_generic_timer.o: $(srcdir)/src/generic/timer.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_menu.o: $(srcdir)/src/osx/carbon/menu.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/menu.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_generic_timer.o: $(srcdir)/src/generic/timer.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_menu.o: $(srcdir)/src/osx/cocoa/menu.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/menu.mm
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_generic_timer.o: $(srcdir)/src/generic/timer.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_menu.o: $(srcdir)/src/cocoa/menu.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/menu.mm
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_app.o: $(srcdir)/src/x11/app.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/app.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_menu.o: $(srcdir)/src/os2/menu.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/menu.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_clipbrd.o: $(srcdir)/src/x11/clipbrd.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/clipbrd.cpp
-@COND_USE_GUI_1_WXUNIV_1@corelib_menu.o: $(srcdir)/src/univ/menu.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/menu.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_colour.o: $(srcdir)/src/x11/colour.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/colour.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_msgdlg.o: $(srcdir)/src/gtk/msgdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/msgdlg.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_cursor.o: $(srcdir)/src/x11/cursor.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/cursor.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_msgdlg.o: $(srcdir)/src/motif/msgdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/msgdlg.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_data.o: $(srcdir)/src/x11/data.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/data.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/msgdlg.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_dataobj.o: $(srcdir)/src/x11/dataobj.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/dataobj.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/msgdlg.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_dc.o: $(srcdir)/src/x11/dc.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/dc.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_msgdlg.o: $(srcdir)/src/osx/carbon/msgdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/msgdlg.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_dcclient.o: $(srcdir)/src/x11/dcclient.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/dcclient.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_msgdlg.o: $(srcdir)/src/osx/cocoa/msgdlg.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/msgdlg.mm
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_dcmemory.o: $(srcdir)/src/x11/dcmemory.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/dcmemory.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_msgdlg.o: $(srcdir)/src/cocoa/msgdlg.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/msgdlg.mm
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_dcscreen.o: $(srcdir)/src/x11/dcscreen.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/dcscreen.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_msgdlg.o: $(srcdir)/src/os2/msgdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/msgdlg.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_evtloop.o: $(srcdir)/src/x11/evtloop.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/evtloop.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_nativewin.o: $(srcdir)/src/gtk/nativewin.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/nativewin.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_font.o: $(srcdir)/src/x11/font.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/font.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/nativewin.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_minifram.o: $(srcdir)/src/x11/minifram.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/minifram.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/nativewin.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_nanox.o: $(srcdir)/src/x11/nanox.c $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(CORELIB_CFLAGS) $(srcdir)/src/x11/nanox.c
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_notebook.o: $(srcdir)/src/gtk/notebook.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/notebook.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_popupwin.o: $(srcdir)/src/x11/popupwin.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/popupwin.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_notebook.o: $(srcdir)/src/gtk1/notebook.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/notebook.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_reparent.o: $(srcdir)/src/x11/reparent.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/reparent.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_notebook.o: $(srcdir)/src/generic/notebook.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/notebook.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_settings.o: $(srcdir)/src/x11/settings.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/settings.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_notebook.o: $(srcdir)/src/msw/notebook.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/notebook.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_toplevel.o: $(srcdir)/src/x11/toplevel.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/toplevel.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_notebook.o: $(srcdir)/src/msw/notebook.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/notebook.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_utils.o: $(srcdir)/src/x11/utils.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/utils.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_notebook.o: $(srcdir)/src/osx/cocoa/notebook.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/notebook.mm
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_window.o: $(srcdir)/src/x11/window.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/window.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_notebook.o: $(srcdir)/src/cocoa/notebook.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/notebook.mm
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_notebook.o: $(srcdir)/src/os2/notebook.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/notebook.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
-@COND_USE_GUI_1_WXUNIV_1@corelib_notebook.o: $(srcdir)/src/univ/notebook.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/notebook.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_generic_colour.o: $(srcdir)/src/generic/colour.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_radiobox.o: $(srcdir)/src/gtk/radiobox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/radiobox.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_generic_colour.o: $(srcdir)/src/generic/colour.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_radiobox.o: $(srcdir)/src/gtk1/radiobox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/radiobox.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mask.o: $(srcdir)/src/generic/mask.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_radiobox.o: $(srcdir)/src/motif/radiobox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/radiobox.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_mask.o: $(srcdir)/src/generic/mask.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/radiobox.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_app.o: $(srcdir)/src/mgl/app.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/app.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/radiobox.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_bitmap.o: $(srcdir)/src/mgl/bitmap.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/bitmap.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_radiobox.o: $(srcdir)/src/cocoa/radiobox.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/radiobox.mm
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_brush.o: $(srcdir)/src/mgl/brush.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/brush.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_radiobox.o: $(srcdir)/src/os2/radiobox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/radiobox.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_clipbrd.o: $(srcdir)/src/mgl/clipbrd.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/clipbrd.cpp
-@COND_USE_GUI_1_WXUNIV_1@corelib_radiobox.o: $(srcdir)/src/univ/radiobox.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/radiobox.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_cursor.o: $(srcdir)/src/mgl/cursor.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/cursor.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_radiobut.o: $(srcdir)/src/gtk/radiobut.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/radiobut.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_data.o: $(srcdir)/src/mgl/data.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/data.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_radiobut.o: $(srcdir)/src/gtk1/radiobut.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/radiobut.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_dc.o: $(srcdir)/src/mgl/dc.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/dc.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_radiobut.o: $(srcdir)/src/motif/radiobut.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/radiobut.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/dcclient.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/radiobut.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_dcmemory.o: $(srcdir)/src/mgl/dcmemory.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/dcmemory.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/radiobut.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_dcscreen.o: $(srcdir)/src/mgl/dcscreen.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/dcscreen.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_radiobut.o: $(srcdir)/src/osx/carbon/radiobut.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/radiobut.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_dirmgl.o: $(srcdir)/src/mgl/dirmgl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/dirmgl.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_radiobut.o: $(srcdir)/src/osx/cocoa/radiobut.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/radiobut.mm
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/evtloop.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_radiobut.o: $(srcdir)/src/cocoa/radiobut.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/radiobut.mm
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_font.o: $(srcdir)/src/mgl/font.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/font.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_radiobut.o: $(srcdir)/src/os2/radiobut.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/radiobut.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_fontenum.o: $(srcdir)/src/mgl/fontenum.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/fontenum.cpp
-@COND_USE_GUI_1_WXUNIV_1@corelib_radiobut.o: $(srcdir)/src/univ/radiobut.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/radiobut.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_fontmgr.o: $(srcdir)/src/mgl/fontmgr.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/fontmgr.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_scrolbar.o: $(srcdir)/src/gtk/scrolbar.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/scrolbar.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_fontutil.o: $(srcdir)/src/mgl/fontutil.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/fontutil.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_scrolbar.o: $(srcdir)/src/gtk1/scrolbar.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/scrolbar.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_palette.o: $(srcdir)/src/mgl/palette.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/palette.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_scrolbar.o: $(srcdir)/src/motif/scrolbar.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/scrolbar.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_pen.o: $(srcdir)/src/mgl/pen.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/pen.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_region.o: $(srcdir)/src/mgl/region.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/region.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_settings.o: $(srcdir)/src/mgl/settings.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/settings.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_scrolbar.o: $(srcdir)/src/osx/carbon/scrolbar.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/scrolbar.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_toplevel.o: $(srcdir)/src/mgl/toplevel.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/toplevel.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_scrolbar.o: $(srcdir)/src/osx/cocoa/scrolbar.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/scrolbar.mm
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_utils.o: $(srcdir)/src/mgl/utils.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/utils.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_scrolbar.o: $(srcdir)/src/cocoa/scrolbar.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/scrolbar.mm
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_window.o: $(srcdir)/src/mgl/window.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/window.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/scrolbar.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_app.o: $(srcdir)/src/dfb/app.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/app.cpp
-@COND_USE_GUI_1_WXUNIV_1@corelib_scrolbar.o: $(srcdir)/src/univ/scrolbar.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/scrolbar.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_bitmap.o: $(srcdir)/src/dfb/bitmap.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/bitmap.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_scrolwin.o: $(srcdir)/src/gtk/scrolwin.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/scrolwin.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_brush.o: $(srcdir)/src/dfb/brush.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/brush.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_scrolwin.o: $(srcdir)/src/gtk1/scrolwin.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/scrolwin.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_cursor.o: $(srcdir)/src/dfb/cursor.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/cursor.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/gtk/slider.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/slider.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_dc.o: $(srcdir)/src/dfb/dc.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/dc.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/gtk1/slider.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/slider.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_dcclient.o: $(srcdir)/src/dfb/dcclient.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/dcclient.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/motif/slider.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/slider.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_dcmemory.o: $(srcdir)/src/dfb/dcmemory.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/dcmemory.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/msw/slider.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_dcscreen.o: $(srcdir)/src/dfb/dcscreen.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/dcscreen.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/msw/slider.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_evtloop.o: $(srcdir)/src/dfb/evtloop.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/evtloop.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/osx/carbon/slider.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/slider.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_font.o: $(srcdir)/src/dfb/font.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/font.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/osx/cocoa/slider.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/slider.mm
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_fontenum.o: $(srcdir)/src/dfb/fontenum.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/fontenum.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/cocoa/slider.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/slider.mm
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_fontmgr.o: $(srcdir)/src/dfb/fontmgr.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/fontmgr.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/os2/slider.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/slider.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_nonownedwnd.o: $(srcdir)/src/dfb/nonownedwnd.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/nonownedwnd.cpp
-@COND_USE_GUI_1_WXUNIV_1@corelib_slider.o: $(srcdir)/src/univ/slider.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/slider.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_overlay.o: $(srcdir)/src/dfb/overlay.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/overlay.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_spinbutt.o: $(srcdir)/src/gtk/spinbutt.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/spinbutt.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_pen.o: $(srcdir)/src/dfb/pen.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/pen.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_spinbutt.o: $(srcdir)/src/gtk1/spinbutt.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/spinbutt.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_region.o: $(srcdir)/src/dfb/region.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/region.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_spinbutt.o: $(srcdir)/src/motif/spinbutt.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/spinbutt.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_settings.o: $(srcdir)/src/dfb/settings.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/settings.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/spinbutt.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_toplevel.o: $(srcdir)/src/dfb/toplevel.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/toplevel.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/spinbutt.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_utils.o: $(srcdir)/src/dfb/utils.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/utils.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_spinbutt.o: $(srcdir)/src/osx/carbon/spinbutt.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/spinbutt.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_window.o: $(srcdir)/src/dfb/window.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/window.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_spinbutt.o: $(srcdir)/src/osx/cocoa/spinbutt.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/spinbutt.mm
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_wrapdfb.o: $(srcdir)/src/dfb/wrapdfb.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/wrapdfb.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_spinbutt.o: $(srcdir)/src/cocoa/spinbutt.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/spinbutt.mm
+@COND_PLATFORM_UNIX_1_USE_GUI_1@corelib_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_UNIX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_spinbutt.o: $(srcdir)/src/os2/spinbutt.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/spinbutt.cpp
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@corelib_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
-@COND_USE_GUI_1_WXUNIV_1@corelib_spinbutt.o: $(srcdir)/src/univ/spinbutt.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/spinbutt.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_spinctrl.o: $(srcdir)/src/gtk/spinctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/spinctrl.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_spinctrl.o: $(srcdir)/src/gtk1/spinctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/spinctrl.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp
+@COND_USE_GUI_1_WXUNIV_1@corelib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/spinctrl.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_statbmp.o: $(srcdir)/src/gtk/statbmp.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/statbmp.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_statbmp.o: $(srcdir)/src/gtk1/statbmp.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/statbmp.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_statbmp.o: $(srcdir)/src/motif/statbmp.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/statbmp.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statbmp.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statbmp.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_statbmp.o: $(srcdir)/src/osx/carbon/statbmp.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statbmp.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_statbmp.o: $(srcdir)/src/cocoa/statbmp.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/statbmp.mm
+@COND_USE_GUI_1_WXUNIV_1@corelib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_statbmp.o: $(srcdir)/src/os2/statbmp.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/statbmp.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_USE_GUI_1_WXUNIV_1@corelib_statbmp.o: $(srcdir)/src/univ/statbmp.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/statbmp.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_statbox.o: $(srcdir)/src/gtk/statbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/statbox.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_statbox.o: $(srcdir)/src/gtk1/statbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/statbox.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_statbox.o: $(srcdir)/src/motif/statbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/statbox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_statbox.o: $(srcdir)/src/msw/statbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_statbox.o: $(srcdir)/src/msw/statbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_statbox.o: $(srcdir)/src/osx/carbon/statbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statbox.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_statbox.o: $(srcdir)/src/osx/cocoa/statbox.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/statbox.mm
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_statbox.o: $(srcdir)/src/cocoa/statbox.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/statbox.mm
+@COND_USE_GUI_1_WXUNIV_1@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_statbox.o: $(srcdir)/src/os2/statbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/statbox.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_USE_GUI_1_WXUNIV_1@corelib_statbox.o: $(srcdir)/src/univ/statbox.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/statbox.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_statline.o: $(srcdir)/src/gtk/statline.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/statline.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_statline.o: $(srcdir)/src/gtk1/statline.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/statline.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_statline.o: $(srcdir)/src/generic/statline.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statline.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_statline.o: $(srcdir)/src/msw/statline.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statline.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_statline.o: $(srcdir)/src/msw/statline.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statline.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_statline.o: $(srcdir)/src/osx/cocoa/statline.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/statline.mm
+@COND_USE_GUI_1_WXUNIV_1@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_statline.o: $(srcdir)/src/os2/statline.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/statline.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-@COND_USE_GUI_1_WXUNIV_1@corelib_statline.o: $(srcdir)/src/univ/statline.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/statline.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_stattext.o: $(srcdir)/src/gtk/stattext.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/stattext.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_stattext.o: $(srcdir)/src/gtk1/stattext.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/stattext.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_stattext.o: $(srcdir)/src/motif/stattext.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/stattext.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_stattext.o: $(srcdir)/src/msw/stattext.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_stattext.o: $(srcdir)/src/msw/stattext.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_stattext.o: $(srcdir)/src/osx/carbon/stattext.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/stattext.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_stattext.o: $(srcdir)/src/osx/cocoa/stattext.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/stattext.mm
+@COND_USE_GUI_1_WXUNIV_1@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_stattext.o: $(srcdir)/src/cocoa/stattext.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/stattext.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_stattext.o: $(srcdir)/src/os2/stattext.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/stattext.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_USE_GUI_1_WXUNIV_1@corelib_stattext.o: $(srcdir)/src/univ/stattext.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/stattext.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/tbargtk.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_tbargtk.o: $(srcdir)/src/gtk1/tbargtk.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/tbargtk.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/textctrl.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_textctrl.o: $(srcdir)/src/gtk1/textctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/textctrl.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_textctrl.o: $(srcdir)/src/motif/textctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/textctrl.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/textctrl.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/textctrl.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_textctrl.o: $(srcdir)/src/osx/carbon/textctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/textctrl.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_textctrl.o: $(srcdir)/src/osx/cocoa/textctrl.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/textctrl.mm
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_textctrl.o: $(srcdir)/src/cocoa/textctrl.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/textctrl.mm
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_textctrl.o: $(srcdir)/src/os2/textctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/textctrl.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-@COND_USE_GUI_1_WXUNIV_1@corelib_textctrl.o: $(srcdir)/src/univ/textctrl.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/textctrl.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_textentry.o: $(srcdir)/src/gtk/textentry.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/textentry.cpp
+@COND_USE_GUI_1_WXUNIV_1@corelib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_textentry.o: $(srcdir)/src/motif/textentry.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/textentry.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_textentry.o: $(srcdir)/src/msw/textentry.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_textentry.o: $(srcdir)/src/msw/textentry.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_textentry.o: $(srcdir)/src/os2/textentry.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/textentry.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_tglbtn.o: $(srcdir)/src/gtk/tglbtn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/tglbtn.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_tglbtn.o: $(srcdir)/src/gtk1/tglbtn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/tglbtn.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/tglbtn.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/tglbtn.cpp
+@COND_USE_GUI_1_WXUNIV_1@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_tglbtn.o: $(srcdir)/src/osx/carbon/tglbtn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/tglbtn.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_tglbtn.o: $(srcdir)/src/osx/cocoa/tglbtn.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/tglbtn.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_tglbtn.o: $(srcdir)/src/os2/tglbtn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/tglbtn.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
-@COND_USE_GUI_1_WXUNIV_1@corelib_tglbtn.o: $(srcdir)/src/univ/tglbtn.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/tglbtn.cpp
+@COND_USE_GUI_1_WXUNIV_1@corelib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
@@ -30851,155 +30657,425 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1_WXUNIV_1@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/menuitem.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_button.o: $(srcdir)/src/msw/button.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/button.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_button.o: $(srcdir)/src/msw/button.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/button.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/checkbox.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/checkbox.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_choice.o: $(srcdir)/src/msw/choice.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/choice.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_choice.o: $(srcdir)/src/msw/choice.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/choice.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/colordlg.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/colordlg.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_combo.o: $(srcdir)/src/msw/combo.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/combo.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_combo.o: $(srcdir)/src/msw/combo.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/combo.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_combobox.o: $(srcdir)/src/msw/combobox.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/combobox.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_combobox.o: $(srcdir)/src/msw/combobox.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/combobox.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_control.o: $(srcdir)/src/msw/control.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/control.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_control.o: $(srcdir)/src/msw/control.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/control.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_dialog.o: $(srcdir)/src/msw/dialog.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dialog.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_dialog.o: $(srcdir)/src/msw/dialog.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dialog.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_dirdlg.o: $(srcdir)/src/msw/dirdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dirdlg.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_dirdlg.o: $(srcdir)/src/msw/dirdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dirdlg.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_frame.o: $(srcdir)/src/msw/frame.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/frame.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_frame.o: $(srcdir)/src/msw/frame.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/frame.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_gauge.o: $(srcdir)/src/msw/gauge.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_gauge.o: $(srcdir)/src/msw/gauge.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_listbox.o: $(srcdir)/src/msw/listbox.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/listbox.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_listbox.o: $(srcdir)/src/msw/listbox.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/listbox.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_listctrl.o: $(srcdir)/src/msw/listctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/listctrl.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_listctrl.o: $(srcdir)/src/msw/listctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/listctrl.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_mdi.o: $(srcdir)/src/msw/mdi.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/mdi.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_mdi.o: $(srcdir)/src/msw/mdi.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/mdi.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_menu.o: $(srcdir)/src/msw/menu.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/menu.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_menu.o: $(srcdir)/src/msw/menu.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/menu.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_menuitem.o: $(srcdir)/src/msw/menuitem.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_menuitem.o: $(srcdir)/src/msw/menuitem.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/menuitem.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_menuitem.o: $(srcdir)/src/msw/menuitem.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_menuitem.o: $(srcdir)/src/msw/menuitem.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/menuitem.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_menuitem.o: $(srcdir)/src/osx/carbon/menuitem.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/menuitem.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_metafile.o: $(srcdir)/src/msw/metafile.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/metafile.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_metafile.o: $(srcdir)/src/msw/metafile.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/metafile.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/msgdlg.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/msgdlg.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/nativewin.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/nativewin.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_notebook.o: $(srcdir)/src/msw/notebook.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/notebook.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_notebook.o: $(srcdir)/src/msw/notebook.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/notebook.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_access.o: $(srcdir)/src/msw/ole/access.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_access.o: $(srcdir)/src/msw/ole/access.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/radiobox.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/radiobox.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/radiobut.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/radiobut.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_slider.o: $(srcdir)/src/msw/slider.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_slider.o: $(srcdir)/src/msw/slider.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/spinbutt.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/spinbutt.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statbmp.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statbmp.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_statbox.o: $(srcdir)/src/msw/statbox.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_statbox.o: $(srcdir)/src/msw/statbox.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_statline.o: $(srcdir)/src/msw/statline.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statline.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_statline.o: $(srcdir)/src/msw/statline.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statline.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_menuitem.o: $(srcdir)/src/osx/cocoa/menuitem.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/menuitem.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_stattext.o: $(srcdir)/src/msw/stattext.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_menuitem.o: $(srcdir)/src/cocoa/menuitem.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/menuitem.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_stattext.o: $(srcdir)/src/msw/stattext.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_menuitem.o: $(srcdir)/src/os2/menuitem.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/menuitem.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/tabctrl.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_toolbar.o: $(srcdir)/src/motif/toolbar.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/toolbar.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/tabctrl.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_toolbar.o: $(srcdir)/src/osx/carbon/toolbar.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/toolbar.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/textctrl.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/textctrl.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_textentry.o: $(srcdir)/src/msw/textentry.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_textentry.o: $(srcdir)/src/msw/textentry.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/tglbtn.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/tglbtn.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_toolbar.o: $(srcdir)/src/osx/cocoa/toolbar.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/toolbar.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_toolbar.o: $(srcdir)/src/cocoa/toolbar.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/toolbar.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_toolbar.o: $(srcdir)/src/os2/toolbar.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/toolbar.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
-@COND_USE_GUI_1_WXUNIV_1@corelib_toolbar.o: $(srcdir)/src/univ/toolbar.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/toolbar.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_app.o: $(srcdir)/src/osx/carbon/app.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_combo.o: $(srcdir)/src/msw/combo.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/combo.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_app.o: $(srcdir)/src/osx/carbon/app.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_combo.o: $(srcdir)/src/msw/combo.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/combo.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_control.o: $(srcdir)/src/osx/carbon/control.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_control.o: $(srcdir)/src/osx/carbon/control.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_iniconf.o: $(srcdir)/src/os2/iniconf.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/iniconf.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_metafile.o: $(srcdir)/src/msw/metafile.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/metafile.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_metafile.o: $(srcdir)/src/msw/metafile.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/metafile.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_metafile.o: $(srcdir)/src/os2/metafile.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/metafile.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_nativdlg.o: $(srcdir)/src/os2/nativdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/nativdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_access.o: $(srcdir)/src/msw/ole/access.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_dnd.o: $(srcdir)/src/osx/carbon/dnd.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dnd.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_access.o: $(srcdir)/src/msw/ole/access.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_dnd.o: $(srcdir)/src/osx/carbon/dnd.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dnd.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_font.o: $(srcdir)/src/osx/carbon/font.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_font.o: $(srcdir)/src/osx/carbon/font.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/ownerdrw.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_mdi.o: $(srcdir)/src/osx/carbon/mdi.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/mdi.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/tabctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_mdi.o: $(srcdir)/src/osx/carbon/mdi.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/mdi.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/tabctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_tabctrl.o: $(srcdir)/src/osx/carbon/tabctrl.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/tabctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_tabctrl.o: $(srcdir)/src/osx/carbon/tabctrl.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/tabctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_tabctrl.o: $(srcdir)/src/os2/tabctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/tabctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_printdlg.o: $(srcdir)/src/osx/carbon/printdlg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/printdlg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_printdlg.o: $(srcdir)/src/osx/carbon/printdlg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/printdlg.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_glgrab.o: $(srcdir)/src/osx/core/glgrab.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/glgrab.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_glgrab.o: $(srcdir)/src/osx/core/glgrab.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/glgrab.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(CORELIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
@@ -31007,17 +31083,17 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(CORELIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_tabctrl.o: $(srcdir)/src/osx/carbon/tabctrl.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/tabctrl.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_tabctrl.o: $(srcdir)/src/osx/carbon/tabctrl.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/tabctrl.cpp
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_srchctrl.o: $(srcdir)/src/osx/carbon/srchctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/srchctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_srchctrl.o: $(srcdir)/src/osx/cocoa/srchctrl.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/srchctrl.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_regiong.o: $(srcdir)/src/generic/regiong.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp
@@ -31415,9 +31491,21 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
advdll_version_rc.o: $(srcdir)/src/msw/version.rc $(ADVDLL_ODEP)
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_ADV
+advdll_gtk_aboutdlg.o: $(srcdir)/src/gtk/aboutdlg.cpp $(ADVDLL_ODEP)
+ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/aboutdlg.cpp
+
advdll_animate.o: $(srcdir)/src/gtk/animate.cpp $(ADVDLL_ODEP)
$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/animate.cpp
+advdll_gtk_bmpcbox.o: $(srcdir)/src/gtk/bmpcbox.cpp $(ADVDLL_ODEP)
+ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/bmpcbox.cpp
+
+advdll_gtk_calctrl.o: $(srcdir)/src/gtk/calctrl.cpp $(ADVDLL_ODEP)
+ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/calctrl.cpp
+
+advdll_gtk_dataview.o: $(srcdir)/src/gtk/dataview.cpp $(ADVDLL_ODEP)
+ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/dataview.cpp
+
advdll_hyperlink.o: $(srcdir)/src/gtk/hyperlink.cpp $(ADVDLL_ODEP)
$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/hyperlink.cpp
@@ -31553,119 +31641,98 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
@COND_WXUNIV_1@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP)
@COND_WXUNIV_1@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-@COND_TOOLKIT_MSW@advdll_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_MSW@advdll_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
-@COND_TOOLKIT_WINCE@advdll_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_WINCE@advdll_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
-@COND_TOOLKIT_OSX_CARBON@advdll_aboutdlg.o: $(srcdir)/src/osx/carbon/aboutdlg.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/aboutdlg.cpp
-
-@COND_TOOLKIT_OSX_COCOA@advdll_aboutdlg.o: $(srcdir)/src/osx/cocoa/aboutdlg.mm $(ADVDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/aboutdlg.mm
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@advdll_aboutdlg.o: $(srcdir)/src/gtk/aboutdlg.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/aboutdlg.cpp
-
-@COND_TOOLKIT_MSW@advdll_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_MSW@advdll_msw_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
-@COND_TOOLKIT_WINCE@advdll_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_WINCE@advdll_msw_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_notifmsg.o: $(srcdir)/src/gtk/hildon/notifmsg.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/hildon/notifmsg.cpp
-
-@COND_TOOLKIT_MSW@advdll_sound.o: $(srcdir)/src/msw/sound.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_MSW@advdll_msw_sound.o: $(srcdir)/src/msw/sound.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/sound.cpp
-@COND_TOOLKIT_WINCE@advdll_sound.o: $(srcdir)/src/msw/sound.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_WINCE@advdll_msw_sound.o: $(srcdir)/src/msw/sound.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/sound.cpp
-@COND_TOOLKIT_OSX_CARBON@advdll_sound.o: $(srcdir)/src/osx/carbon/sound.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/sound.cpp
-
-@COND_TOOLKIT_MOTIF@advdll_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+@COND_TOOLKIT_MSW@advdll_msw_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/taskbar.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+@COND_TOOLKIT_WINCE@advdll_msw_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/taskbar.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advdll_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+@COND_TOOLKIT_MSW@advdll_msw_joystick.o: $(srcdir)/src/msw/joystick.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/joystick.cpp
-@COND_TOOLKIT_X11@advdll_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+@COND_TOOLKIT_OSX_CARBON@advdll_carbon_aboutdlg.o: $(srcdir)/src/osx/carbon/aboutdlg.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/aboutdlg.cpp
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advdll_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+@COND_TOOLKIT_OSX_CARBON@advdll_drawer.o: $(srcdir)/src/osx/carbon/drawer.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/drawer.cpp
-@COND_TOOLKIT_PM@advdll_sound.o: $(srcdir)/src/os2/sound.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_PM@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/os2/sound.cpp
+@COND_TOOLKIT_OSX_CARBON@advdll_carbon_dataview.o: $(srcdir)/src/osx/carbon/dataview.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dataview.cpp
-@COND_TOOLKIT_MSW@advdll_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/taskbar.cpp
+@COND_TOOLKIT_OSX_CARBON@advdll_databrow.o: $(srcdir)/src/osx/carbon/databrow.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/databrow.cpp
-@COND_TOOLKIT_WINCE@advdll_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/taskbar.cpp
+@COND_TOOLKIT_OSX_CARBON@advdll_carbon_sound.o: $(srcdir)/src/osx/carbon/sound.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/sound.cpp
-@COND_TOOLKIT_OSX_CARBON@advdll_taskbar.o: $(srcdir)/src/osx/carbon/taskbar.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON@advdll_carbon_taskbar.o: $(srcdir)/src/osx/carbon/taskbar.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/taskbar.cpp
-@COND_TOOLKIT_OSX_COCOA@advdll_taskbar.o: $(srcdir)/src/osx/cocoa/taskbar.mm $(ADVDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/taskbar.mm
+@COND_TOOLKIT_OSX_CARBON@advdll_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
+
+@COND_TOOLKIT_OSX_COCOA@advdll_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
-@COND_TOOLKIT_COCOA@advdll_taskbar.o: $(srcdir)/src/cocoa/taskbar.mm $(ADVDLL_ODEP)
-@COND_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/cocoa/taskbar.mm
+@COND_TOOLKIT_COCOA@advdll_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_taskbar.o: $(srcdir)/src/gtk/taskbar.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/taskbar.cpp
+@COND_TOOLKIT_OSX_COCOA@advdll_cocoa_aboutdlg.o: $(srcdir)/src/osx/cocoa/aboutdlg.mm $(ADVDLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(ADVDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/aboutdlg.mm
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advdll_taskbar.o: $(srcdir)/src/gtk1/taskbar.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk1/taskbar.cpp
+@COND_TOOLKIT_OSX_COCOA@advdll_osx_cocoa_taskbar.o: $(srcdir)/src/osx/cocoa/taskbar.mm $(ADVDLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(ADVDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/taskbar.mm
-@COND_TOOLKIT_MSW@advdll_joystick.o: $(srcdir)/src/msw/joystick.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/joystick.cpp
+@COND_TOOLKIT_COCOA@advdll_src_cocoa_taskbar.o: $(srcdir)/src/cocoa/taskbar.mm $(ADVDLL_ODEP)
+@COND_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(ADVDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/taskbar.mm
-@COND_TOOLKIT_MOTIF@advdll_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_MOTIF@advdll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advdll_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advdll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-@COND_TOOLKIT_X11@advdll_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_X11@advdll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advdll_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVDLL_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advdll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVDLL_ODEP)
@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-@COND_TOOLKIT_PM@advdll_joystick.o: $(srcdir)/src/os2/joystick.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_PM@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/os2/joystick.cpp
-
-@COND_TOOLKIT_OSX_CARBON@advdll_drawer.o: $(srcdir)/src/osx/carbon/drawer.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/drawer.cpp
-
-@COND_TOOLKIT_OSX_CARBON@advdll_dataview.o: $(srcdir)/src/osx/carbon/dataview.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dataview.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@advdll_dataview.o: $(srcdir)/src/gtk/dataview.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/dataview.cpp
+@COND_TOOLKIT_MOTIF@advdll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
-@COND_TOOLKIT_OSX_CARBON@advdll_databrow.o: $(srcdir)/src/osx/carbon/databrow.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/databrow.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
-@COND_TOOLKIT_OSX_CARBON@advdll_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advdll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
-@COND_TOOLKIT_OSX_COCOA@advdll_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
+@COND_TOOLKIT_X11@advdll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
-@COND_TOOLKIT_COCOA@advdll_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advdll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
@COND_TOOLKIT_MOTIF@advdll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
@@ -31682,28 +31749,37 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advdll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVDLL_ODEP)
@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(ADVDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_gtk_taskbar.o: $(srcdir)/src/gtk/taskbar.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/taskbar.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_gtk_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(ADVDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ $(CCC) -c -o $@ $(ADVDLL_CFLAGS) $(srcdir)/src/gtk/eggtrayicon.c
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advdll_eggtrayicon.o: $(srcdir)/src/gtk1/eggtrayicon.c $(ADVDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_hildon_notifmsg.o: $(srcdir)/src/gtk/hildon/notifmsg.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/hildon/notifmsg.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advdll_gtk1_eggtrayicon.o: $(srcdir)/src/gtk1/eggtrayicon.c $(ADVDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ $(CCC) -c -o $@ $(ADVDLL_CFLAGS) $(srcdir)/src/gtk1/eggtrayicon.c
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@advdll_bmpcbox.o: $(srcdir)/src/gtk/bmpcbox.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/bmpcbox.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advdll_gtk1_taskbar.o: $(srcdir)/src/gtk1/taskbar.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk1/taskbar.cpp
+
+@COND_TOOLKIT_PM@advdll_os2_joystick.o: $(srcdir)/src/os2/joystick.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_PM@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/os2/joystick.cpp
+
+@COND_TOOLKIT_PM@advdll_os2_sound.o: $(srcdir)/src/os2/sound.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_PM@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/os2/sound.cpp
-@COND_TOOLKIT_MSW_WXUNIV_0@advdll_bmpcbox.o: $(srcdir)/src/msw/bmpcbox.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_MSW_WXUNIV_0@advdll_msw_bmpcbox.o: $(srcdir)/src/msw/bmpcbox.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_MSW_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/bmpcbox.cpp
-@COND_TOOLKIT_WINCE_WXUNIV_0@advdll_bmpcbox.o: $(srcdir)/src/msw/bmpcbox.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_WINCE_WXUNIV_0@advdll_msw_bmpcbox.o: $(srcdir)/src/msw/bmpcbox.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_WINCE_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/bmpcbox.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@advdll_calctrl.o: $(srcdir)/src/gtk/calctrl.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/calctrl.cpp
-
-@COND_TOOLKIT_MSW_WXUNIV_0@advdll_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_MSW_WXUNIV_0@advdll_msw_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_MSW_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
-@COND_TOOLKIT_WINCE_WXUNIV_0@advdll_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_WINCE_WXUNIV_0@advdll_msw_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_WINCE_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
@COND_TOOLKIT_MSW_WXUNIV_0@advdll_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(ADVDLL_ODEP)
@@ -31718,9 +31794,21 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_WINCE_WXUNIV_0@advdll_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_WINCE_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp
+advlib_gtk_aboutdlg.o: $(srcdir)/src/gtk/aboutdlg.cpp $(ADVLIB_ODEP)
+ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/aboutdlg.cpp
+
advlib_animate.o: $(srcdir)/src/gtk/animate.cpp $(ADVLIB_ODEP)
$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/animate.cpp
+advlib_gtk_bmpcbox.o: $(srcdir)/src/gtk/bmpcbox.cpp $(ADVLIB_ODEP)
+ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/bmpcbox.cpp
+
+advlib_gtk_calctrl.o: $(srcdir)/src/gtk/calctrl.cpp $(ADVLIB_ODEP)
+ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/calctrl.cpp
+
+advlib_gtk_dataview.o: $(srcdir)/src/gtk/dataview.cpp $(ADVLIB_ODEP)
+ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/dataview.cpp
+
advlib_hyperlink.o: $(srcdir)/src/gtk/hyperlink.cpp $(ADVLIB_ODEP)
$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/hyperlink.cpp
@@ -31856,119 +31944,98 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
@COND_WXUNIV_1@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP)
@COND_WXUNIV_1@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-@COND_TOOLKIT_MSW@advlib_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_MSW@advlib_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
-@COND_TOOLKIT_WINCE@advlib_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_WINCE@advlib_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
-@COND_TOOLKIT_OSX_CARBON@advlib_aboutdlg.o: $(srcdir)/src/osx/carbon/aboutdlg.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/aboutdlg.cpp
-
-@COND_TOOLKIT_OSX_COCOA@advlib_aboutdlg.o: $(srcdir)/src/osx/cocoa/aboutdlg.mm $(ADVLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/aboutdlg.mm
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@advlib_aboutdlg.o: $(srcdir)/src/gtk/aboutdlg.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/aboutdlg.cpp
-
-@COND_TOOLKIT_MSW@advlib_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_MSW@advlib_msw_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
-@COND_TOOLKIT_WINCE@advlib_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_WINCE@advlib_msw_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_notifmsg.o: $(srcdir)/src/gtk/hildon/notifmsg.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/hildon/notifmsg.cpp
-
-@COND_TOOLKIT_MSW@advlib_sound.o: $(srcdir)/src/msw/sound.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_MSW@advlib_msw_sound.o: $(srcdir)/src/msw/sound.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/sound.cpp
-@COND_TOOLKIT_WINCE@advlib_sound.o: $(srcdir)/src/msw/sound.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_WINCE@advlib_msw_sound.o: $(srcdir)/src/msw/sound.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/sound.cpp
-@COND_TOOLKIT_OSX_CARBON@advlib_sound.o: $(srcdir)/src/osx/carbon/sound.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/sound.cpp
-
-@COND_TOOLKIT_MOTIF@advlib_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+@COND_TOOLKIT_MSW@advlib_msw_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/taskbar.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+@COND_TOOLKIT_WINCE@advlib_msw_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/taskbar.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advlib_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+@COND_TOOLKIT_MSW@advlib_msw_joystick.o: $(srcdir)/src/msw/joystick.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/joystick.cpp
-@COND_TOOLKIT_X11@advlib_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+@COND_TOOLKIT_OSX_CARBON@advlib_carbon_aboutdlg.o: $(srcdir)/src/osx/carbon/aboutdlg.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/aboutdlg.cpp
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advlib_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+@COND_TOOLKIT_OSX_CARBON@advlib_drawer.o: $(srcdir)/src/osx/carbon/drawer.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/drawer.cpp
-@COND_TOOLKIT_PM@advlib_sound.o: $(srcdir)/src/os2/sound.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_PM@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/os2/sound.cpp
+@COND_TOOLKIT_OSX_CARBON@advlib_carbon_dataview.o: $(srcdir)/src/osx/carbon/dataview.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dataview.cpp
-@COND_TOOLKIT_MSW@advlib_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/taskbar.cpp
+@COND_TOOLKIT_OSX_CARBON@advlib_databrow.o: $(srcdir)/src/osx/carbon/databrow.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/databrow.cpp
-@COND_TOOLKIT_WINCE@advlib_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/taskbar.cpp
+@COND_TOOLKIT_OSX_CARBON@advlib_carbon_sound.o: $(srcdir)/src/osx/carbon/sound.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/sound.cpp
-@COND_TOOLKIT_OSX_CARBON@advlib_taskbar.o: $(srcdir)/src/osx/carbon/taskbar.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON@advlib_carbon_taskbar.o: $(srcdir)/src/osx/carbon/taskbar.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/taskbar.cpp
-@COND_TOOLKIT_OSX_COCOA@advlib_taskbar.o: $(srcdir)/src/osx/cocoa/taskbar.mm $(ADVLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/taskbar.mm
+@COND_TOOLKIT_OSX_CARBON@advlib_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
-@COND_TOOLKIT_COCOA@advlib_taskbar.o: $(srcdir)/src/cocoa/taskbar.mm $(ADVLIB_ODEP)
-@COND_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/cocoa/taskbar.mm
+@COND_TOOLKIT_OSX_COCOA@advlib_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_taskbar.o: $(srcdir)/src/gtk/taskbar.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/taskbar.cpp
+@COND_TOOLKIT_COCOA@advlib_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advlib_taskbar.o: $(srcdir)/src/gtk1/taskbar.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk1/taskbar.cpp
+@COND_TOOLKIT_OSX_COCOA@advlib_cocoa_aboutdlg.o: $(srcdir)/src/osx/cocoa/aboutdlg.mm $(ADVLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(ADVLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/aboutdlg.mm
-@COND_TOOLKIT_MSW@advlib_joystick.o: $(srcdir)/src/msw/joystick.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/joystick.cpp
+@COND_TOOLKIT_OSX_COCOA@advlib_osx_cocoa_taskbar.o: $(srcdir)/src/osx/cocoa/taskbar.mm $(ADVLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(ADVLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/taskbar.mm
-@COND_TOOLKIT_MOTIF@advlib_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_COCOA@advlib_src_cocoa_taskbar.o: $(srcdir)/src/cocoa/taskbar.mm $(ADVLIB_ODEP)
+@COND_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(ADVLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/taskbar.mm
+
+@COND_TOOLKIT_MOTIF@advlib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advlib_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advlib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-@COND_TOOLKIT_X11@advlib_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_X11@advlib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advlib_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVLIB_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advlib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVLIB_ODEP)
@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-@COND_TOOLKIT_PM@advlib_joystick.o: $(srcdir)/src/os2/joystick.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_PM@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/os2/joystick.cpp
-
-@COND_TOOLKIT_OSX_CARBON@advlib_drawer.o: $(srcdir)/src/osx/carbon/drawer.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/drawer.cpp
-
-@COND_TOOLKIT_OSX_CARBON@advlib_dataview.o: $(srcdir)/src/osx/carbon/dataview.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dataview.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@advlib_dataview.o: $(srcdir)/src/gtk/dataview.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/dataview.cpp
+@COND_TOOLKIT_MOTIF@advlib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
-@COND_TOOLKIT_OSX_CARBON@advlib_databrow.o: $(srcdir)/src/osx/carbon/databrow.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/databrow.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
-@COND_TOOLKIT_OSX_CARBON@advlib_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advlib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
-@COND_TOOLKIT_OSX_COCOA@advlib_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
+@COND_TOOLKIT_X11@advlib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
-@COND_TOOLKIT_COCOA@advlib_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advlib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
@COND_TOOLKIT_MOTIF@advlib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
@@ -31985,28 +32052,37 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advlib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVLIB_ODEP)
@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(ADVLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_gtk_taskbar.o: $(srcdir)/src/gtk/taskbar.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/taskbar.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_gtk_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(ADVLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ $(CCC) -c -o $@ $(ADVLIB_CFLAGS) $(srcdir)/src/gtk/eggtrayicon.c
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advlib_eggtrayicon.o: $(srcdir)/src/gtk1/eggtrayicon.c $(ADVLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_hildon_notifmsg.o: $(srcdir)/src/gtk/hildon/notifmsg.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/hildon/notifmsg.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advlib_gtk1_eggtrayicon.o: $(srcdir)/src/gtk1/eggtrayicon.c $(ADVLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ $(CCC) -c -o $@ $(ADVLIB_CFLAGS) $(srcdir)/src/gtk1/eggtrayicon.c
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@advlib_bmpcbox.o: $(srcdir)/src/gtk/bmpcbox.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/bmpcbox.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advlib_gtk1_taskbar.o: $(srcdir)/src/gtk1/taskbar.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk1/taskbar.cpp
+
+@COND_TOOLKIT_PM@advlib_os2_joystick.o: $(srcdir)/src/os2/joystick.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_PM@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/os2/joystick.cpp
+
+@COND_TOOLKIT_PM@advlib_os2_sound.o: $(srcdir)/src/os2/sound.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_PM@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/os2/sound.cpp
-@COND_TOOLKIT_MSW_WXUNIV_0@advlib_bmpcbox.o: $(srcdir)/src/msw/bmpcbox.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_MSW_WXUNIV_0@advlib_msw_bmpcbox.o: $(srcdir)/src/msw/bmpcbox.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_MSW_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/bmpcbox.cpp
-@COND_TOOLKIT_WINCE_WXUNIV_0@advlib_bmpcbox.o: $(srcdir)/src/msw/bmpcbox.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_WINCE_WXUNIV_0@advlib_msw_bmpcbox.o: $(srcdir)/src/msw/bmpcbox.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_WINCE_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/bmpcbox.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@advlib_calctrl.o: $(srcdir)/src/gtk/calctrl.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/calctrl.cpp
-
-@COND_TOOLKIT_MSW_WXUNIV_0@advlib_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_MSW_WXUNIV_0@advlib_msw_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_MSW_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
-@COND_TOOLKIT_WINCE_WXUNIV_0@advlib_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_WINCE_WXUNIV_0@advlib_msw_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_WINCE_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
@COND_TOOLKIT_MSW_WXUNIV_0@advlib_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(ADVLIB_ODEP)
@@ -32027,6 +32103,12 @@ mediadll_version_rc.o: $(srcdir)/src/msw/version.rc $(MEDIADLL_ODEP)
mediadll_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIADLL_ODEP)
$(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/common/mediactrlcmn.cpp
+mediadll_carbon_mediactrl.o: $(srcdir)/src/osx/carbon/mediactrl.cpp $(MEDIADLL_ODEP)
+ $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/osx/carbon/mediactrl.cpp
+
+mediadll_cocoa_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MEDIADLL_ODEP)
+ $(CXXC) -c -o $@ $(MEDIADLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/mediactrl.mm
+
@COND_TOOLKIT_MSW@mediadll_mediactrl_am.o: $(srcdir)/src/msw/mediactrl_am.cpp $(MEDIADLL_ODEP)
@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_am.cpp
@@ -32051,24 +32133,24 @@ mediadll_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIADLL_ODEP)
@COND_TOOLKIT_WINCE@mediadll_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MEDIADLL_ODEP)
@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
-@COND_TOOLKIT_OSX_CARBON@mediadll_mediactrl.o: $(srcdir)/src/osx/carbon/mediactrl.cpp $(MEDIADLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/osx/carbon/mediactrl.cpp
-
-@COND_TOOLKIT_COCOA@mediadll_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MEDIADLL_ODEP)
-@COND_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/cocoa/mediactrl.mm
-
-@COND_TOOLKIT_MOTIF@mediadll_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIADLL_ODEP)
+@COND_TOOLKIT_MOTIF@mediadll_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIADLL_ODEP)
@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
-@COND_TOOLKIT_GTK@mediadll_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIADLL_ODEP)
+@COND_TOOLKIT_GTK@mediadll_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIADLL_ODEP)
@COND_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
-@COND_TOOLKIT_X11@mediadll_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIADLL_ODEP)
+@COND_TOOLKIT_X11@mediadll_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIADLL_ODEP)
@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
medialib_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIALIB_ODEP)
$(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/common/mediactrlcmn.cpp
+medialib_carbon_mediactrl.o: $(srcdir)/src/osx/carbon/mediactrl.cpp $(MEDIALIB_ODEP)
+ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/osx/carbon/mediactrl.cpp
+
+medialib_cocoa_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MEDIALIB_ODEP)
+ $(CXXC) -c -o $@ $(MEDIALIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/mediactrl.mm
+
@COND_TOOLKIT_MSW@medialib_mediactrl_am.o: $(srcdir)/src/msw/mediactrl_am.cpp $(MEDIALIB_ODEP)
@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_am.cpp
@@ -32093,19 +32175,13 @@ medialib_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIALIB_ODEP)
@COND_TOOLKIT_WINCE@medialib_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MEDIALIB_ODEP)
@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
-@COND_TOOLKIT_OSX_CARBON@medialib_mediactrl.o: $(srcdir)/src/osx/carbon/mediactrl.cpp $(MEDIALIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/osx/carbon/mediactrl.cpp
-
-@COND_TOOLKIT_COCOA@medialib_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MEDIALIB_ODEP)
-@COND_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/cocoa/mediactrl.mm
-
-@COND_TOOLKIT_MOTIF@medialib_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIALIB_ODEP)
+@COND_TOOLKIT_MOTIF@medialib_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIALIB_ODEP)
@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
-@COND_TOOLKIT_GTK@medialib_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIALIB_ODEP)
+@COND_TOOLKIT_GTK@medialib_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIALIB_ODEP)
@COND_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
-@COND_TOOLKIT_X11@medialib_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIALIB_ODEP)
+@COND_TOOLKIT_X11@medialib_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIALIB_ODEP)
@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
htmldll_version_rc.o: $(srcdir)/src/msw/version.rc $(HTMLDLL_ODEP)
@@ -32822,35 +32898,23 @@ gldll_version_rc.o: $(srcdir)/src/msw/version.rc $(GLDLL_ODEP)
gldll_glcmn.o: $(srcdir)/src/common/glcmn.cpp $(GLDLL_ODEP)
$(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/common/glcmn.cpp
-@COND_TOOLKIT_OSX_CARBON@gldll_glcanvas.o: $(srcdir)/src/osx/carbon/glcanvas.cpp $(GLDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/glcanvas.cpp
-
-@COND_TOOLKIT_OSX_COCOA@gldll_glcanvas.o: $(srcdir)/src/osx/cocoa/glcanvas.mm $(GLDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/glcanvas.mm
+gldll_carbon_glcanvas.o: $(srcdir)/src/osx/carbon/glcanvas.cpp $(GLDLL_ODEP)
+ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/glcanvas.cpp
-@COND_TOOLKIT_COCOA@gldll_glcanvas.o: $(srcdir)/src/cocoa/glcanvas.mm $(GLDLL_ODEP)
-@COND_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/cocoa/glcanvas.mm
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@gldll_glcanvas.o: $(srcdir)/src/gtk/glcanvas.cpp $(GLDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/gtk/glcanvas.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@gldll_glcanvas.o: $(srcdir)/src/gtk1/glcanvas.cpp $(GLDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/gtk1/glcanvas.cpp
-
-@COND_TOOLKIT_MSW@gldll_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp $(GLDLL_ODEP)
-@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/msw/glcanvas.cpp
+gldll_osx_cocoa_glcanvas.o: $(srcdir)/src/osx/cocoa/glcanvas.mm $(GLDLL_ODEP)
+ $(CXXC) -c -o $@ $(GLDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/glcanvas.mm
-@COND_TOOLKIT_WINCE@gldll_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp $(GLDLL_ODEP)
-@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/msw/glcanvas.cpp
+gldll_src_cocoa_glcanvas.o: $(srcdir)/src/cocoa/glcanvas.mm $(GLDLL_ODEP)
+ $(CXXC) -c -o $@ $(GLDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/glcanvas.mm
-@COND_TOOLKIT_MOTIF@gldll_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp $(GLDLL_ODEP)
-@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/x11/glcanvas.cpp
+gldll_gtk_glcanvas.o: $(srcdir)/src/gtk/glcanvas.cpp $(GLDLL_ODEP)
+ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/gtk/glcanvas.cpp
-@COND_TOOLKIT_X11@gldll_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp $(GLDLL_ODEP)
-@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/x11/glcanvas.cpp
+gldll_gtk1_glcanvas.o: $(srcdir)/src/gtk1/glcanvas.cpp $(GLDLL_ODEP)
+ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/gtk1/glcanvas.cpp
-@COND_TOOLKIT_PM@gldll_glcanvas.o: $(srcdir)/src/os2/glcanvas.cpp $(GLDLL_ODEP)
-@COND_TOOLKIT_PM@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/os2/glcanvas.cpp
+gldll_os2_glcanvas.o: $(srcdir)/src/os2/glcanvas.cpp $(GLDLL_ODEP)
+ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/os2/glcanvas.cpp
@COND_TOOLKIT_OSX_CARBON@gldll_glcanvas_osx.o: $(srcdir)/src/osx/glcanvas_osx.cpp $(GLDLL_ODEP)
@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/osx/glcanvas_osx.cpp
@@ -32870,38 +32934,38 @@ gldll_glcmn.o: $(srcdir)/src/common/glcmn.cpp $(GLDLL_ODEP)
@COND_TOOLKIT_X11@gldll_glx11.o: $(srcdir)/src/unix/glx11.cpp $(GLDLL_ODEP)
@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/unix/glx11.cpp
-gllib_glcmn.o: $(srcdir)/src/common/glcmn.cpp $(GLLIB_ODEP)
- $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/common/glcmn.cpp
+@COND_TOOLKIT_MSW@gldll_msw_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp $(GLDLL_ODEP)
+@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/msw/glcanvas.cpp
-@COND_TOOLKIT_OSX_CARBON@gllib_glcanvas.o: $(srcdir)/src/osx/carbon/glcanvas.cpp $(GLLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/glcanvas.cpp
+@COND_TOOLKIT_WINCE@gldll_msw_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp $(GLDLL_ODEP)
+@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/msw/glcanvas.cpp
-@COND_TOOLKIT_OSX_COCOA@gllib_glcanvas.o: $(srcdir)/src/osx/cocoa/glcanvas.mm $(GLLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/glcanvas.mm
+@COND_TOOLKIT_MOTIF@gldll_x11_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp $(GLDLL_ODEP)
+@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/x11/glcanvas.cpp
-@COND_TOOLKIT_COCOA@gllib_glcanvas.o: $(srcdir)/src/cocoa/glcanvas.mm $(GLLIB_ODEP)
-@COND_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/cocoa/glcanvas.mm
+@COND_TOOLKIT_X11@gldll_x11_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp $(GLDLL_ODEP)
+@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/x11/glcanvas.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@gllib_glcanvas.o: $(srcdir)/src/gtk/glcanvas.cpp $(GLLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/gtk/glcanvas.cpp
+gllib_glcmn.o: $(srcdir)/src/common/glcmn.cpp $(GLLIB_ODEP)
+ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/common/glcmn.cpp
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@gllib_glcanvas.o: $(srcdir)/src/gtk1/glcanvas.cpp $(GLLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/gtk1/glcanvas.cpp
+gllib_carbon_glcanvas.o: $(srcdir)/src/osx/carbon/glcanvas.cpp $(GLLIB_ODEP)
+ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/glcanvas.cpp
-@COND_TOOLKIT_MSW@gllib_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp $(GLLIB_ODEP)
-@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/msw/glcanvas.cpp
+gllib_osx_cocoa_glcanvas.o: $(srcdir)/src/osx/cocoa/glcanvas.mm $(GLLIB_ODEP)
+ $(CXXC) -c -o $@ $(GLLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/glcanvas.mm
-@COND_TOOLKIT_WINCE@gllib_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp $(GLLIB_ODEP)
-@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/msw/glcanvas.cpp
+gllib_src_cocoa_glcanvas.o: $(srcdir)/src/cocoa/glcanvas.mm $(GLLIB_ODEP)
+ $(CXXC) -c -o $@ $(GLLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/glcanvas.mm
-@COND_TOOLKIT_MOTIF@gllib_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp $(GLLIB_ODEP)
-@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/x11/glcanvas.cpp
+gllib_gtk_glcanvas.o: $(srcdir)/src/gtk/glcanvas.cpp $(GLLIB_ODEP)
+ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/gtk/glcanvas.cpp
-@COND_TOOLKIT_X11@gllib_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp $(GLLIB_ODEP)
-@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/x11/glcanvas.cpp
+gllib_gtk1_glcanvas.o: $(srcdir)/src/gtk1/glcanvas.cpp $(GLLIB_ODEP)
+ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/gtk1/glcanvas.cpp
-@COND_TOOLKIT_PM@gllib_glcanvas.o: $(srcdir)/src/os2/glcanvas.cpp $(GLLIB_ODEP)
-@COND_TOOLKIT_PM@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/os2/glcanvas.cpp
+gllib_os2_glcanvas.o: $(srcdir)/src/os2/glcanvas.cpp $(GLLIB_ODEP)
+ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/os2/glcanvas.cpp
@COND_TOOLKIT_OSX_CARBON@gllib_glcanvas_osx.o: $(srcdir)/src/osx/glcanvas_osx.cpp $(GLLIB_ODEP)
@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/osx/glcanvas_osx.cpp
@@ -32921,6 +32985,18 @@ gllib_glcmn.o: $(srcdir)/src/common/glcmn.cpp $(GLLIB_ODEP)
@COND_TOOLKIT_X11@gllib_glx11.o: $(srcdir)/src/unix/glx11.cpp $(GLLIB_ODEP)
@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/unix/glx11.cpp
+@COND_TOOLKIT_MSW@gllib_msw_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp $(GLLIB_ODEP)
+@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/msw/glcanvas.cpp
+
+@COND_TOOLKIT_WINCE@gllib_msw_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp $(GLLIB_ODEP)
+@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/msw/glcanvas.cpp
+
+@COND_TOOLKIT_MOTIF@gllib_x11_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp $(GLLIB_ODEP)
+@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/x11/glcanvas.cpp
+
+@COND_TOOLKIT_X11@gllib_x11_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp $(GLLIB_ODEP)
+@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/x11/glcanvas.cpp
+
sound_sdl_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp
$(CXXC) -c -o $@ $(SOUND_SDL_CXXFLAGS) $(srcdir)/src/unix/sound_sdl.cpp
@@ -33846,6 +33922,26 @@ rpm: bzip-dist
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean install_wxregex uninstall_wxregex install_wxzlib uninstall_wxzlib install_wxpng uninstall_wxpng install_wxjpeg uninstall_wxjpeg install_wxtiff uninstall_wxtiff install_wxexpat uninstall_wxexpat install_wxscintilla uninstall_wxscintilla install_monodll uninstall_monodll install_monolib uninstall_monolib install_basedll uninstall_basedll install_baselib uninstall_baselib wxbase install_netdll uninstall_netdll install_netlib uninstall_netlib wxnet install_coredll uninstall_coredll install_corelib uninstall_corelib wxcore install_advdll uninstall_advdll install_advlib uninstall_advlib wxadv install_mediadll uninstall_mediadll install_medialib uninstall_medialib wxmedia install_htmldll uninstall_htmldll install_htmllib uninstall_htmllib wxhtml install_qadll uninstall_qadll install_qalib uninstall_qalib wxqa install_xmldll uninstall_xmldll install_xmllib uninstall_xmllib wxxml install_xrcdll uninstall_xrcdll install_xrclib uninstall_xrclib wxxrc install_auidll uninstall_auidll install_auilib uninstall_auilib wxaui install_propgriddll uninstall_propgriddll install_propgridlib uninstall_propgridlib wxpropgrid install_richtextdll uninstall_richtextdll install_richtextlib uninstall_richtextlib wxrichtext install_stcdll uninstall_stcdll install_stclib uninstall_stclib wxstc install_gldll uninstall_gldll install_gllib uninstall_gllib wxgl install_sound_sdl uninstall_sound_sdl samples
+@IF_GNU_MAKE@-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean install_wxregex uninstall_wxregex \
+ install_wxzlib uninstall_wxzlib install_wxpng uninstall_wxpng install_wxjpeg \
+ uninstall_wxjpeg install_wxtiff uninstall_wxtiff install_wxexpat \
+ uninstall_wxexpat install_wxscintilla uninstall_wxscintilla install_monodll \
+ uninstall_monodll install_monolib uninstall_monolib install_basedll \
+ uninstall_basedll install_baselib uninstall_baselib wxbase install_netdll \
+ uninstall_netdll install_netlib uninstall_netlib wxnet install_coredll \
+ uninstall_coredll install_corelib uninstall_corelib wxcore install_advdll \
+ uninstall_advdll install_advlib uninstall_advlib wxadv install_mediadll \
+ uninstall_mediadll install_medialib uninstall_medialib wxmedia \
+ install_htmldll uninstall_htmldll install_htmllib uninstall_htmllib wxhtml \
+ install_qadll uninstall_qadll install_qalib uninstall_qalib wxqa \
+ install_xmldll uninstall_xmldll install_xmllib uninstall_xmllib wxxml \
+ install_xrcdll uninstall_xrcdll install_xrclib uninstall_xrclib wxxrc \
+ install_auidll uninstall_auidll install_auilib uninstall_auilib wxaui \
+ install_propgriddll uninstall_propgriddll install_propgridlib \
+ uninstall_propgridlib wxpropgrid install_richtextdll uninstall_richtextdll \
+ install_richtextlib uninstall_richtextlib wxrichtext install_stcdll \
+ uninstall_stcdll install_stclib uninstall_stclib wxstc install_gldll \
+ uninstall_gldll install_gllib uninstall_gllib wxgl install_sound_sdl \
+ uninstall_sound_sdl samples
diff --git a/autoconf_inc.m4 b/autoconf_inc.m4
index 08ad6d7c5b..bf207f0f1b 100644
--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -1,92 +1,146 @@
-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/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/font/font.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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+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/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/font/font.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/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/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/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.3 (http://www.bakefile.org)
+dnl Bakefile 0.2.4 (http://www.bakefile.org)
dnl Do not modify, all changes will be overwritten!
-BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.3"
+BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.4"
dnl ### begin block 10_AC_BAKEFILE_PRECOMP_HEADERS[../../tests/test.bkl,wx.bkl] ###
AC_BAKEFILE_PRECOMP_HEADERS
-dnl ### begin block 20_COND_BUILD_DEBUG[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_DEBUG[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
COND_BUILD_DEBUG="#"
if test "x$BUILD" = "xdebug" ; then
COND_BUILD_DEBUG=""
fi
AC_SUBST(COND_BUILD_DEBUG)
-dnl ### begin block 20_COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT="#"
if test "x$BUILD" = "xdebug" -a "x$DEBUG_FLAG" = "xdefault" ; then
COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT=""
fi
AC_SUBST(COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT)
-dnl ### begin block 20_COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT="#"
if test "x$BUILD" = "xdebug" -a "x$DEBUG_INFO" = "xdefault" ; then
COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT=""
fi
AC_SUBST(COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT)
-dnl ### begin block 20_COND_BUILD_DEBUG_UNICODE_0[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_DEBUG_UNICODE_0[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
COND_BUILD_DEBUG_UNICODE_0="#"
if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then
COND_BUILD_DEBUG_UNICODE_0=""
fi
AC_SUBST(COND_BUILD_DEBUG_UNICODE_0)
-dnl ### begin block 20_COND_BUILD_DEBUG_UNICODE_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_DEBUG_UNICODE_1[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
COND_BUILD_DEBUG_UNICODE_1="#"
if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then
COND_BUILD_DEBUG_UNICODE_1=""
fi
AC_SUBST(COND_BUILD_DEBUG_UNICODE_1)
-dnl ### begin block 20_COND_BUILD_RELEASE[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_RELEASE[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
COND_BUILD_RELEASE="#"
if test "x$BUILD" = "xrelease" ; then
COND_BUILD_RELEASE=""
fi
AC_SUBST(COND_BUILD_RELEASE)
-dnl ### begin block 20_COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT="#"
if test "x$BUILD" = "xrelease" -a "x$DEBUG_INFO" = "xdefault" ; then
COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT=""
fi
AC_SUBST(COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT)
-dnl ### begin block 20_COND_BUILD_RELEASE_UNICODE_0[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_RELEASE_UNICODE_0[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
COND_BUILD_RELEASE_UNICODE_0="#"
if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x0" ; then
COND_BUILD_RELEASE_UNICODE_0=""
fi
AC_SUBST(COND_BUILD_RELEASE_UNICODE_0)
-dnl ### begin block 20_COND_BUILD_RELEASE_UNICODE_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_RELEASE_UNICODE_1[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
COND_BUILD_RELEASE_UNICODE_1="#"
if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then
COND_BUILD_RELEASE_UNICODE_1=""
fi
AC_SUBST(COND_BUILD_RELEASE_UNICODE_1)
-dnl ### begin block 20_COND_DEBUG_FLAG_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_debug[../../demos/bombs/bombs.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/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/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/font/font.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/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/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/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/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/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/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+ COND_BUILD_debug="#"
+ if test "x$BUILD" = "xdebug" ; then
+ COND_BUILD_debug=""
+ fi
+ AC_SUBST(COND_BUILD_debug)
+dnl ### begin block 20_COND_BUILD_debug_DEBUG_FLAG_default[../../demos/bombs/bombs.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/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/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/font/font.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/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/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/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/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/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/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+ COND_BUILD_debug_DEBUG_FLAG_default="#"
+ if test "x$BUILD" = "xdebug" -a "x$DEBUG_FLAG" = "xdefault" ; then
+ COND_BUILD_debug_DEBUG_FLAG_default=""
+ fi
+ AC_SUBST(COND_BUILD_debug_DEBUG_FLAG_default)
+dnl ### begin block 20_COND_BUILD_debug_DEBUG_INFO_default[../../demos/bombs/bombs.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/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/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/font/font.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/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/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/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/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/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/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+ COND_BUILD_debug_DEBUG_INFO_default="#"
+ if test "x$BUILD" = "xdebug" -a "x$DEBUG_INFO" = "xdefault" ; then
+ COND_BUILD_debug_DEBUG_INFO_default=""
+ fi
+ AC_SUBST(COND_BUILD_debug_DEBUG_INFO_default)
+dnl ### begin block 20_COND_BUILD_debug_UNICODE_0[../../demos/bombs/bombs.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/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/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/font/font.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/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/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/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/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/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/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+ COND_BUILD_debug_UNICODE_0="#"
+ if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then
+ COND_BUILD_debug_UNICODE_0=""
+ fi
+ AC_SUBST(COND_BUILD_debug_UNICODE_0)
+dnl ### begin block 20_COND_BUILD_debug_UNICODE_1[../../demos/bombs/bombs.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/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/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/font/font.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/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/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/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/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/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/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+ COND_BUILD_debug_UNICODE_1="#"
+ if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then
+ COND_BUILD_debug_UNICODE_1=""
+ fi
+ AC_SUBST(COND_BUILD_debug_UNICODE_1)
+dnl ### begin block 20_COND_BUILD_release[../../demos/bombs/bombs.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/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/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/font/font.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/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/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/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/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/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/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+ COND_BUILD_release="#"
+ if test "x$BUILD" = "xrelease" ; then
+ COND_BUILD_release=""
+ fi
+ AC_SUBST(COND_BUILD_release)
+dnl ### begin block 20_COND_BUILD_release_DEBUG_INFO_default[../../demos/bombs/bombs.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/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/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/font/font.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/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/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/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/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/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/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+ COND_BUILD_release_DEBUG_INFO_default="#"
+ if test "x$BUILD" = "xrelease" -a "x$DEBUG_INFO" = "xdefault" ; then
+ COND_BUILD_release_DEBUG_INFO_default=""
+ fi
+ AC_SUBST(COND_BUILD_release_DEBUG_INFO_default)
+dnl ### begin block 20_COND_BUILD_release_UNICODE_0[../../demos/bombs/bombs.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/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/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/font/font.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/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/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/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/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/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/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+ COND_BUILD_release_UNICODE_0="#"
+ if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x0" ; then
+ COND_BUILD_release_UNICODE_0=""
+ fi
+ AC_SUBST(COND_BUILD_release_UNICODE_0)
+dnl ### begin block 20_COND_BUILD_release_UNICODE_1[../../demos/bombs/bombs.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/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/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/font/font.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/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/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/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/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/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/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+ COND_BUILD_release_UNICODE_1="#"
+ if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then
+ COND_BUILD_release_UNICODE_1=""
+ fi
+ AC_SUBST(COND_BUILD_release_UNICODE_1)
+dnl ### begin block 20_COND_DEBUG_FLAG_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/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/wxrc/wxrc.bkl,wx.bkl] ###
COND_DEBUG_FLAG_1="#"
if test "x$DEBUG_FLAG" = "x1" ; then
COND_DEBUG_FLAG_1=""
fi
AC_SUBST(COND_DEBUG_FLAG_1)
-dnl ### begin block 20_COND_DEBUG_INFO_0[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_DEBUG_INFO_0[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/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/wxrc/wxrc.bkl,wx.bkl] ###
COND_DEBUG_INFO_0="#"
if test "x$DEBUG_INFO" = "x0" ; then
COND_DEBUG_INFO_0=""
fi
AC_SUBST(COND_DEBUG_INFO_0)
-dnl ### begin block 20_COND_DEBUG_INFO_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_DEBUG_INFO_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/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/wxrc/wxrc.bkl,wx.bkl] ###
COND_DEBUG_INFO_1="#"
if test "x$DEBUG_INFO" = "x1" ; then
COND_DEBUG_INFO_1=""
fi
AC_SUBST(COND_DEBUG_INFO_1)
-dnl ### begin block 20_COND_DEPS_TRACKING_0[../../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/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/font/font.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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_DEPS_TRACKING_0[../../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/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/font/font.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/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/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/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] ###
COND_DEPS_TRACKING_0="#"
if test "x$DEPS_TRACKING" = "x0" ; then
COND_DEPS_TRACKING_0=""
fi
AC_SUBST(COND_DEPS_TRACKING_0)
-dnl ### begin block 20_COND_DEPS_TRACKING_1[../../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/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/font/font.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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_DEPS_TRACKING_1[../../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/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/font/font.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/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/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/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] ###
COND_DEPS_TRACKING_1="#"
if test "x$DEPS_TRACKING" = "x1" ; then
COND_DEPS_TRACKING_1=""
@@ -104,7 +158,7 @@ dnl ### begin block 20_COND_ICC_PCH_1[../../tests/test.bkl,wx.bkl] ###
COND_ICC_PCH_1=""
fi
AC_SUBST(COND_ICC_PCH_1)
-dnl ### begin block 20_COND_MONOLITHIC_0[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_0[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/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/wxrc/wxrc.bkl,wx.bkl] ###
COND_MONOLITHIC_0="#"
if test "x$MONOLITHIC" = "x0" ; then
COND_MONOLITHIC_0=""
@@ -254,7 +308,7 @@ dnl ### begin block 20_COND_MONOLITHIC_0_USE_HTML_1[wx.bkl] ###
COND_MONOLITHIC_0_USE_HTML_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_USE_HTML_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_USE_MEDIA_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_0_USE_MEDIA_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/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/wxrc/wxrc.bkl,wx.bkl] ###
COND_MONOLITHIC_0_USE_MEDIA_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$USE_MEDIA" = "x1" ; then
COND_MONOLITHIC_0_USE_MEDIA_1=""
@@ -290,7 +344,7 @@ dnl ### begin block 20_COND_MONOLITHIC_0_USE_XRC_1[wx.bkl] ###
COND_MONOLITHIC_0_USE_XRC_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_USE_XRC_1)
-dnl ### begin block 20_COND_MONOLITHIC_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/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/wxrc/wxrc.bkl,wx.bkl] ###
COND_MONOLITHIC_1="#"
if test "x$MONOLITHIC" = "x1" ; then
COND_MONOLITHIC_1=""
@@ -308,13 +362,13 @@ dnl ### begin block 20_COND_MONOLITHIC_1_SHARED_1[wx.bkl] ###
COND_MONOLITHIC_1_SHARED_1=""
fi
AC_SUBST(COND_MONOLITHIC_1_SHARED_1)
-dnl ### begin block 20_COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/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/wxrc/wxrc.bkl,wx.bkl] ###
COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1="#"
if test "x$OFFICIAL_BUILD" = "x0" -a "x$PLATFORM_WIN32" = "x1" ; then
COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1=""
fi
AC_SUBST(COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1)
-dnl ### begin block 20_COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/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/wxrc/wxrc.bkl,wx.bkl] ###
COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1="#"
if test "x$OFFICIAL_BUILD" = "x1" -a "x$PLATFORM_WIN32" = "x1" ; then
COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1=""
@@ -332,7 +386,7 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVERSION_1[wx.bkl] ###
COND_PLATFORM_MACOSX_0_USE_SOVERSION_1=""
fi
AC_SUBST(COND_PLATFORM_MACOSX_0_USE_SOVERSION_1)
-dnl ### begin block 20_COND_PLATFORM_MACOSX_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_MACOSX_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/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/wxrc/wxrc.bkl,wx.bkl] ###
COND_PLATFORM_MACOSX_1="#"
if test "x$PLATFORM_MACOSX" = "x1" ; then
COND_PLATFORM_MACOSX_1=""
@@ -386,19 +440,19 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_1_USE_SOVERSION_1[wx.bkl] ###
COND_PLATFORM_MACOSX_1_USE_SOVERSION_1=""
fi
AC_SUBST(COND_PLATFORM_MACOSX_1_USE_SOVERSION_1)
-dnl ### begin block 20_COND_PLATFORM_MACOS_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_MACOS_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/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/wxrc/wxrc.bkl,wx.bkl] ###
COND_PLATFORM_MACOS_1="#"
if test "x$PLATFORM_MACOS" = "x1" ; then
COND_PLATFORM_MACOS_1=""
fi
AC_SUBST(COND_PLATFORM_MACOS_1)
-dnl ### begin block 20_COND_PLATFORM_MAC_0[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_MAC_0[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/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/wxrc/wxrc.bkl] ###
COND_PLATFORM_MAC_0="#"
if test "x$PLATFORM_MAC" = "x0" ; then
COND_PLATFORM_MAC_0=""
fi
AC_SUBST(COND_PLATFORM_MAC_0)
-dnl ### begin block 20_COND_PLATFORM_MAC_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_MAC_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/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/wxrc/wxrc.bkl] ###
COND_PLATFORM_MAC_1="#"
if test "x$PLATFORM_MAC" = "x1" ; then
COND_PLATFORM_MAC_1=""
@@ -410,25 +464,25 @@ dnl ### begin block 20_COND_PLATFORM_MSDOS_0[../../samples/dialup/dialup.bkl] ##
COND_PLATFORM_MSDOS_0=""
fi
AC_SUBST(COND_PLATFORM_MSDOS_0)
-dnl ### begin block 20_COND_PLATFORM_MSDOS_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_MSDOS_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/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/wxrc/wxrc.bkl,wx.bkl] ###
COND_PLATFORM_MSDOS_1="#"
if test "x$PLATFORM_MSDOS" = "x1" ; then
COND_PLATFORM_MSDOS_1=""
fi
AC_SUBST(COND_PLATFORM_MSDOS_1)
-dnl ### begin block 20_COND_PLATFORM_OS2_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_OS2_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/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/wxrc/wxrc.bkl,wx.bkl] ###
COND_PLATFORM_OS2_1="#"
if test "x$PLATFORM_OS2" = "x1" ; then
COND_PLATFORM_OS2_1=""
fi
AC_SUBST(COND_PLATFORM_OS2_1)
-dnl ### begin block 20_COND_PLATFORM_UNIX_0[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_UNIX_0[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/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/wxrc/wxrc.bkl,wx.bkl] ###
COND_PLATFORM_UNIX_0="#"
if test "x$PLATFORM_UNIX" = "x0" ; then
COND_PLATFORM_UNIX_0=""
fi
AC_SUBST(COND_PLATFORM_UNIX_0)
-dnl ### begin block 20_COND_PLATFORM_UNIX_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_UNIX_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/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/wxrc/wxrc.bkl,wx.bkl] ###
COND_PLATFORM_UNIX_1="#"
if test "x$PLATFORM_UNIX" = "x1" ; then
COND_PLATFORM_UNIX_1=""
@@ -458,13 +512,13 @@ dnl ### begin block 20_COND_PLATFORM_UNIX_1_USE_PLUGINS_0[wx.bkl] ###
COND_PLATFORM_UNIX_1_USE_PLUGINS_0=""
fi
AC_SUBST(COND_PLATFORM_UNIX_1_USE_PLUGINS_0)
-dnl ### begin block 20_COND_PLATFORM_WIN32_0[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_WIN32_0[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/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/wxrc/wxrc.bkl,wx.bkl] ###
COND_PLATFORM_WIN32_0="#"
if test "x$PLATFORM_WIN32" = "x0" ; then
COND_PLATFORM_WIN32_0=""
fi
AC_SUBST(COND_PLATFORM_WIN32_0)
-dnl ### begin block 20_COND_PLATFORM_WIN32_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_WIN32_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/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/wxrc/wxrc.bkl,wx.bkl] ###
COND_PLATFORM_WIN32_1="#"
if test "x$PLATFORM_WIN32" = "x1" ; then
COND_PLATFORM_WIN32_1=""
@@ -500,49 +554,49 @@ dnl ### begin block 20_COND_SHARED_0_USE_GUI_1_USE_OPENGL_1[wx.bkl] ###
COND_SHARED_0_USE_GUI_1_USE_OPENGL_1=""
fi
AC_SUBST(COND_SHARED_0_USE_GUI_1_USE_OPENGL_1)
-dnl ### begin block 20_COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN[wx.bkl] ###
- COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="#"
+dnl ### begin block 20_COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin[wx.bkl] ###
+ COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin="#"
if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
- COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN=""
+ COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin=""
fi
- AC_SUBST(COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN)
-dnl ### begin block 20_COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN[wx.bkl] ###
- COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="#"
+ AC_SUBST(COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin)
+dnl ### begin block 20_COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin[wx.bkl] ###
+ COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin="#"
if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
- COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN=""
+ COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin=""
fi
- AC_SUBST(COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN)
-dnl ### begin block 20_COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN[wx.bkl] ###
- COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="#"
+ AC_SUBST(COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin)
+dnl ### begin block 20_COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin[wx.bkl] ###
+ COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin="#"
if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
- COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
+ COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin=""
fi
- AC_SUBST(COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN)
+ AC_SUBST(COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin)
dnl ### begin block 20_COND_SHARED_0_USE_STC_1[wx.bkl] ###
COND_SHARED_0_USE_STC_1="#"
if test "x$SHARED" = "x0" -a "x$USE_STC" = "x1" ; then
COND_SHARED_0_USE_STC_1=""
fi
AC_SUBST(COND_SHARED_0_USE_STC_1)
-dnl ### begin block 20_COND_SHARED_0_WXUSE_EXPAT_BUILTIN[wx.bkl] ###
- COND_SHARED_0_WXUSE_EXPAT_BUILTIN="#"
+dnl ### begin block 20_COND_SHARED_0_wxUSE_EXPAT_builtin[wx.bkl] ###
+ COND_SHARED_0_wxUSE_EXPAT_builtin="#"
if test "x$SHARED" = "x0" -a "x$wxUSE_EXPAT" = "xbuiltin" ; then
- COND_SHARED_0_WXUSE_EXPAT_BUILTIN=""
+ COND_SHARED_0_wxUSE_EXPAT_builtin=""
fi
- AC_SUBST(COND_SHARED_0_WXUSE_EXPAT_BUILTIN)
-dnl ### begin block 20_COND_SHARED_0_WXUSE_REGEX_BUILTIN[wx.bkl] ###
- COND_SHARED_0_WXUSE_REGEX_BUILTIN="#"
+ AC_SUBST(COND_SHARED_0_wxUSE_EXPAT_builtin)
+dnl ### begin block 20_COND_SHARED_0_wxUSE_REGEX_builtin[wx.bkl] ###
+ COND_SHARED_0_wxUSE_REGEX_builtin="#"
if test "x$SHARED" = "x0" -a "x$wxUSE_REGEX" = "xbuiltin" ; then
- COND_SHARED_0_WXUSE_REGEX_BUILTIN=""
+ COND_SHARED_0_wxUSE_REGEX_builtin=""
fi
- AC_SUBST(COND_SHARED_0_WXUSE_REGEX_BUILTIN)
-dnl ### begin block 20_COND_SHARED_0_WXUSE_ZLIB_BUILTIN[wx.bkl] ###
- COND_SHARED_0_WXUSE_ZLIB_BUILTIN="#"
+ AC_SUBST(COND_SHARED_0_wxUSE_REGEX_builtin)
+dnl ### begin block 20_COND_SHARED_0_wxUSE_ZLIB_builtin[wx.bkl] ###
+ COND_SHARED_0_wxUSE_ZLIB_builtin="#"
if test "x$SHARED" = "x0" -a "x$wxUSE_ZLIB" = "xbuiltin" ; then
- COND_SHARED_0_WXUSE_ZLIB_BUILTIN=""
+ COND_SHARED_0_wxUSE_ZLIB_builtin=""
fi
- AC_SUBST(COND_SHARED_0_WXUSE_ZLIB_BUILTIN)
-dnl ### begin block 20_COND_SHARED_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+ AC_SUBST(COND_SHARED_0_wxUSE_ZLIB_builtin)
+dnl ### begin block 20_COND_SHARED_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/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/wxrc/wxrc.bkl,wx.bkl] ###
COND_SHARED_1="#"
if test "x$SHARED" = "x1" ; then
COND_SHARED_1=""
@@ -560,7 +614,7 @@ dnl ### begin block 20_COND_TOOLKIT_[wx.bkl] ###
COND_TOOLKIT_=""
fi
AC_SUBST(COND_TOOLKIT_)
-dnl ### begin block 20_COND_TOOLKIT_COCOA[../../demos/bombs/bombs.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/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.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/font/font.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/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/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/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/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/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/test.bkl,../../utils/helpview/src/helpview.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_TOOLKIT_COCOA[../../demos/bombs/bombs.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/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.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/font/font.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/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/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/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/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/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/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
COND_TOOLKIT_COCOA="#"
if test "x$TOOLKIT" = "xCOCOA" ; then
COND_TOOLKIT_COCOA=""
@@ -620,12 +674,6 @@ dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0[wx.
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0=""
fi
AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0)
-dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0[wx.bkl] ###
- COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0="#"
- if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$WXUNIV" = "x0" ; then
- COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0=""
- fi
- AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0)
dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1[wx.bkl] ###
COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1="#"
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x" -a "x$USE_GUI" = "x1" ; then
@@ -644,7 +692,7 @@ dnl ### begin block 20_COND_TOOLKIT_GTK_USE_GUI_1[wx.bkl] ###
COND_TOOLKIT_GTK_USE_GUI_1=""
fi
AC_SUBST(COND_TOOLKIT_GTK_USE_GUI_1)
-dnl ### begin block 20_COND_TOOLKIT_MAC[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_TOOLKIT_MAC[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/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/wxrc/wxrc.bkl,wx.bkl] ###
COND_TOOLKIT_MAC="#"
if test "x$TOOLKIT" = "xMAC" ; then
COND_TOOLKIT_MAC=""
@@ -680,7 +728,7 @@ dnl ### begin block 20_COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0[wx.bkl] ###
COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0=""
fi
AC_SUBST(COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0)
-dnl ### begin block 20_COND_TOOLKIT_MSW[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_TOOLKIT_MSW[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/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/wxrc/wxrc.bkl,wx.bkl] ###
COND_TOOLKIT_MSW="#"
if test "x$TOOLKIT" = "xMSW" ; then
COND_TOOLKIT_MSW=""
@@ -704,7 +752,7 @@ dnl ### begin block 20_COND_TOOLKIT_MSW_WXUNIV_0[wx.bkl] ###
COND_TOOLKIT_MSW_WXUNIV_0=""
fi
AC_SUBST(COND_TOOLKIT_MSW_WXUNIV_0)
-dnl ### begin block 20_COND_TOOLKIT_OSX_CARBON[../../demos/bombs/bombs.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/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.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/font/font.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/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/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/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/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/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/test.bkl,../../utils/helpview/src/helpview.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_TOOLKIT_OSX_CARBON[../../demos/bombs/bombs.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/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.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/font/font.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/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/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/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/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/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/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
COND_TOOLKIT_OSX_CARBON="#"
if test "x$TOOLKIT" = "xOSX_CARBON" ; then
COND_TOOLKIT_OSX_CARBON=""
@@ -722,7 +770,7 @@ dnl ### begin block 20_COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0[wx.bkl] ###
COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0=""
fi
AC_SUBST(COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0)
-dnl ### begin block 20_COND_TOOLKIT_OSX_COCOA[../../demos/bombs/bombs.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/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.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/font/font.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/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/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/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/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/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/test.bkl,../../utils/helpview/src/helpview.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_TOOLKIT_OSX_COCOA[../../demos/bombs/bombs.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/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.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/font/font.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/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/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/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/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/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/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
COND_TOOLKIT_OSX_COCOA="#"
if test "x$TOOLKIT" = "xOSX_COCOA" ; then
COND_TOOLKIT_OSX_COCOA=""
@@ -740,7 +788,7 @@ dnl ### begin block 20_COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0[wx.bkl] ###
COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0=""
fi
AC_SUBST(COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0)
-dnl ### begin block 20_COND_TOOLKIT_OSX_IPHONE[../../demos/bombs/bombs.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/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.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/font/font.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/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/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/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/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/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/test.bkl,../../utils/helpview/src/helpview.bkl] ###
+dnl ### begin block 20_COND_TOOLKIT_OSX_IPHONE[../../demos/bombs/bombs.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/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.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/font/font.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/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/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/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/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/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/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl] ###
COND_TOOLKIT_OSX_IPHONE="#"
if test "x$TOOLKIT" = "xOSX_IPHONE" ; then
COND_TOOLKIT_OSX_IPHONE=""
@@ -800,31 +848,31 @@ dnl ### begin block 20_COND_TOOLKIT_X11_USE_GUI_1[wx.bkl] ###
COND_TOOLKIT_X11_USE_GUI_1=""
fi
AC_SUBST(COND_TOOLKIT_X11_USE_GUI_1)
-dnl ### begin block 20_COND_UNICODE_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_UNICODE_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/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/wxrc/wxrc.bkl,wx.bkl] ###
COND_UNICODE_1="#"
if test "x$UNICODE" = "x1" ; then
COND_UNICODE_1=""
fi
AC_SUBST(COND_UNICODE_1)
-dnl ### begin block 20_COND_USE_EXCEPTIONS_0[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_EXCEPTIONS_0[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/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/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_EXCEPTIONS_0="#"
if test "x$USE_EXCEPTIONS" = "x0" ; then
COND_USE_EXCEPTIONS_0=""
fi
AC_SUBST(COND_USE_EXCEPTIONS_0)
-dnl ### begin block 20_COND_USE_EXCEPTIONS_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_EXCEPTIONS_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/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/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_EXCEPTIONS_1="#"
if test "x$USE_EXCEPTIONS" = "x1" ; then
COND_USE_EXCEPTIONS_1=""
fi
AC_SUBST(COND_USE_EXCEPTIONS_1)
-dnl ### begin block 20_COND_USE_GUI_0[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_GUI_0[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/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/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_GUI_0="#"
if test "x$USE_GUI" = "x0" ; then
COND_USE_GUI_0=""
fi
AC_SUBST(COND_USE_GUI_0)
-dnl ### begin block 20_COND_USE_GUI_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_GUI_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/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/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_GUI_1="#"
if test "x$USE_GUI" = "x1" ; then
COND_USE_GUI_1=""
@@ -848,24 +896,42 @@ dnl ### begin block 20_COND_USE_GUI_1_WXUNIV_1[wx.bkl] ###
COND_USE_GUI_1_WXUNIV_1=""
fi
AC_SUBST(COND_USE_GUI_1_WXUNIV_1)
-dnl ### begin block 20_COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="#"
if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN=""
fi
AC_SUBST(COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN)
-dnl ### begin block 20_COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="#"
if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN=""
fi
AC_SUBST(COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN)
-dnl ### begin block 20_COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="#"
if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
fi
AC_SUBST(COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN)
+dnl ### begin block 20_COND_USE_GUI_1_wxUSE_LIBJPEG_builtin[../../demos/bombs/bombs.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/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/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/font/font.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/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/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/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/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/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/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+ COND_USE_GUI_1_wxUSE_LIBJPEG_builtin="#"
+ if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
+ COND_USE_GUI_1_wxUSE_LIBJPEG_builtin=""
+ fi
+ AC_SUBST(COND_USE_GUI_1_wxUSE_LIBJPEG_builtin)
+dnl ### begin block 20_COND_USE_GUI_1_wxUSE_LIBPNG_builtin[../../demos/bombs/bombs.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/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/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/font/font.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/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/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/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/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/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/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+ COND_USE_GUI_1_wxUSE_LIBPNG_builtin="#"
+ if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
+ COND_USE_GUI_1_wxUSE_LIBPNG_builtin=""
+ fi
+ AC_SUBST(COND_USE_GUI_1_wxUSE_LIBPNG_builtin)
+dnl ### begin block 20_COND_USE_GUI_1_wxUSE_LIBTIFF_builtin[../../demos/bombs/bombs.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/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/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/font/font.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/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/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/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/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/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/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+ COND_USE_GUI_1_wxUSE_LIBTIFF_builtin="#"
+ if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
+ COND_USE_GUI_1_wxUSE_LIBTIFF_builtin=""
+ fi
+ AC_SUBST(COND_USE_GUI_1_wxUSE_LIBTIFF_builtin)
dnl ### begin block 20_COND_USE_OPENGL_1[../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl] ###
COND_USE_OPENGL_1="#"
if test "x$USE_OPENGL" = "x1" ; then
@@ -878,19 +944,19 @@ dnl ### begin block 20_COND_USE_PCH_1[../../tests/test.bkl,wx.bkl] ###
COND_USE_PCH_1=""
fi
AC_SUBST(COND_USE_PCH_1)
-dnl ### begin block 20_COND_USE_PLUGINS_0[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_PLUGINS_0[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/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/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_PLUGINS_0="#"
if test "x$USE_PLUGINS" = "x0" ; then
COND_USE_PLUGINS_0=""
fi
AC_SUBST(COND_USE_PLUGINS_0)
-dnl ### begin block 20_COND_USE_RTTI_0[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_RTTI_0[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/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/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_RTTI_0="#"
if test "x$USE_RTTI" = "x0" ; then
COND_USE_RTTI_0=""
fi
AC_SUBST(COND_USE_RTTI_0)
-dnl ### begin block 20_COND_USE_RTTI_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_RTTI_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/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/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_RTTI_1="#"
if test "x$USE_RTTI" = "x1" ; then
COND_USE_RTTI_1=""
@@ -932,13 +998,13 @@ dnl ### begin block 20_COND_USE_STC_1[wx.bkl] ###
COND_USE_STC_1=""
fi
AC_SUBST(COND_USE_STC_1)
-dnl ### begin block 20_COND_USE_THREADS_0[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_THREADS_0[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/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/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_THREADS_0="#"
if test "x$USE_THREADS" = "x0" ; then
COND_USE_THREADS_0=""
fi
AC_SUBST(COND_USE_THREADS_0)
-dnl ### begin block 20_COND_USE_THREADS_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_THREADS_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/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/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_THREADS_1="#"
if test "x$USE_THREADS" = "x1" ; then
COND_USE_THREADS_1=""
@@ -968,45 +1034,81 @@ dnl ### begin block 20_COND_WXUNIV_0[wx.bkl] ###
COND_WXUNIV_0=""
fi
AC_SUBST(COND_WXUNIV_0)
-dnl ### begin block 20_COND_WXUNIV_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_WXUNIV_1[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/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/wxrc/wxrc.bkl,wx.bkl] ###
COND_WXUNIV_1="#"
if test "x$WXUNIV" = "x1" ; then
COND_WXUNIV_1=""
fi
AC_SUBST(COND_WXUNIV_1)
-dnl ### begin block 20_COND_WXUSE_EXPAT_BUILTIN[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_WXUSE_EXPAT_BUILTIN[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
COND_WXUSE_EXPAT_BUILTIN="#"
if test "x$wxUSE_EXPAT" = "xbuiltin" ; then
COND_WXUSE_EXPAT_BUILTIN=""
fi
AC_SUBST(COND_WXUSE_EXPAT_BUILTIN)
-dnl ### begin block 20_COND_WXUSE_LIBJPEG_BUILTIN[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_WXUSE_LIBJPEG_BUILTIN[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
COND_WXUSE_LIBJPEG_BUILTIN="#"
if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
COND_WXUSE_LIBJPEG_BUILTIN=""
fi
AC_SUBST(COND_WXUSE_LIBJPEG_BUILTIN)
-dnl ### begin block 20_COND_WXUSE_LIBPNG_BUILTIN[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_WXUSE_LIBPNG_BUILTIN[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
COND_WXUSE_LIBPNG_BUILTIN="#"
if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
COND_WXUSE_LIBPNG_BUILTIN=""
fi
AC_SUBST(COND_WXUSE_LIBPNG_BUILTIN)
-dnl ### begin block 20_COND_WXUSE_LIBTIFF_BUILTIN[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_WXUSE_LIBTIFF_BUILTIN[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
COND_WXUSE_LIBTIFF_BUILTIN="#"
if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
COND_WXUSE_LIBTIFF_BUILTIN=""
fi
AC_SUBST(COND_WXUSE_LIBTIFF_BUILTIN)
-dnl ### begin block 20_COND_WXUSE_REGEX_BUILTIN[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_WXUSE_REGEX_BUILTIN[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
COND_WXUSE_REGEX_BUILTIN="#"
if test "x$wxUSE_REGEX" = "xbuiltin" ; then
COND_WXUSE_REGEX_BUILTIN=""
fi
AC_SUBST(COND_WXUSE_REGEX_BUILTIN)
-dnl ### begin block 20_COND_WXUSE_ZLIB_BUILTIN[../../demos/bombs/bombs.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/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/font/font.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/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/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/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/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/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/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_WXUSE_ZLIB_BUILTIN[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
COND_WXUSE_ZLIB_BUILTIN="#"
if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
COND_WXUSE_ZLIB_BUILTIN=""
fi
AC_SUBST(COND_WXUSE_ZLIB_BUILTIN)
+dnl ### begin block 20_COND_wxUSE_EXPAT_builtin[../../demos/bombs/bombs.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/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/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/font/font.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/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/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/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/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/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/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+ COND_wxUSE_EXPAT_builtin="#"
+ if test "x$wxUSE_EXPAT" = "xbuiltin" ; then
+ COND_wxUSE_EXPAT_builtin=""
+ fi
+ AC_SUBST(COND_wxUSE_EXPAT_builtin)
+dnl ### begin block 20_COND_wxUSE_LIBJPEG_builtin[../../demos/bombs/bombs.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/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/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/font/font.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/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/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/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/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/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/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+ COND_wxUSE_LIBJPEG_builtin="#"
+ if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
+ COND_wxUSE_LIBJPEG_builtin=""
+ fi
+ AC_SUBST(COND_wxUSE_LIBJPEG_builtin)
+dnl ### begin block 20_COND_wxUSE_LIBPNG_builtin[../../demos/bombs/bombs.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/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/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/font/font.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/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/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/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/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/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/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+ COND_wxUSE_LIBPNG_builtin="#"
+ if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
+ COND_wxUSE_LIBPNG_builtin=""
+ fi
+ AC_SUBST(COND_wxUSE_LIBPNG_builtin)
+dnl ### begin block 20_COND_wxUSE_LIBTIFF_builtin[../../demos/bombs/bombs.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/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/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/font/font.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/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/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/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/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/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/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+ COND_wxUSE_LIBTIFF_builtin="#"
+ if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
+ COND_wxUSE_LIBTIFF_builtin=""
+ fi
+ AC_SUBST(COND_wxUSE_LIBTIFF_builtin)
+dnl ### begin block 20_COND_wxUSE_REGEX_builtin[../../demos/bombs/bombs.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/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/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/font/font.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/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/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/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/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/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/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+ COND_wxUSE_REGEX_builtin="#"
+ if test "x$wxUSE_REGEX" = "xbuiltin" ; then
+ COND_wxUSE_REGEX_builtin=""
+ fi
+ AC_SUBST(COND_wxUSE_REGEX_builtin)
+dnl ### begin block 20_COND_wxUSE_ZLIB_builtin[../../demos/bombs/bombs.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/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/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/font/font.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/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/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/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/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/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/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+ COND_wxUSE_ZLIB_builtin="#"
+ if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
+ COND_wxUSE_ZLIB_builtin=""
+ fi
+ AC_SUBST(COND_wxUSE_ZLIB_builtin)
diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index f2abec66fd..4d31d9f838 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -357,20 +357,6 @@ InputPath=..\..\include\wx\%s
$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
</if>
</set>
- <!-- this should be removed after new bakefile release -->
- <if cond="FORMAT in ['msvs2005prj','msvs2003prj']">
- <if cond="BAKEFILE_VERSION!='0.2.3'">
- <warning>FIXME: THIS OBSOLETE CODE ISN'T NEEDED ANYMORE</warning>
- </if>
- <set var="msvc_copy_setup_h_script">
-Creating $(SETUPHDIR)\wx\setup.h
-InputPath=..\..\include\wx\%s
-
-"$(SETUPHDIR)\wx\setup.h" : "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
-$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
- </set>
- </if>
- <!-- end of what should be removed after new bakefile release -->
<define-tag name="msvc-headers-setup-h" rules="dll,lib">
<if cond="IS_MSVC_PRJ">
@@ -429,19 +415,6 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
"$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(DOLLAR)(SOURCE)" "$(SETUPHDIR)\wx\msw"
$(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
</set>
- <!-- this should be removed after new bakefile release -->
- <if cond="FORMAT in ['msvs2005prj','msvs2003prj']">
- <if cond="BAKEFILE_VERSION!='0.2.3'">
- <warning>FIXME: THIS OBSOLETE CODE ISN'T NEEDED ANYMORE</warning>
- </if>
- <set var="_custom_build_include_wx_msw_genrcdefs_h">
-Creating $(SETUPHDIR)\wx\msw\rcdefs.h
-InputPath=..\..\include\wx\msw\genrcdefs.h
-
-"$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(SETUPHDIR)\wx\msw"
-$(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
- </set>
- </if>
</if>
</define-tag>
diff --git a/build/msw/config.bcc b/build/msw/config.bcc
index 5cf7055c9d..aa91510fff 100644
--- a/build/msw/config.bcc
+++ b/build/msw/config.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This configuration file was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Beware that all changes made to this file will be overwritten next
# time you run Bakefile!
# =========================================================================
diff --git a/build/msw/config.gcc b/build/msw/config.gcc
index a193947311..16312840c8 100644
--- a/build/msw/config.gcc
+++ b/build/msw/config.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This configuration file was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Beware that all changes made to this file will be overwritten next
# time you run Bakefile!
# =========================================================================
@@ -11,133 +11,133 @@
# -------------------------------------------------------------------------
# Compiler flags to link shared library
-LINK_DLL_FLAGS := -shared
+LINK_DLL_FLAGS ?= -shared
# Compiler flags to link loadable module
-LINK_MODULE_FLAGS := -shared
+LINK_MODULE_FLAGS ?= -shared
# C compiler
-CC := gcc
+CC ?= gcc
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for CC
-CFLAGS :=
+CFLAGS ?=
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# The C preprocessor
-CPP := $(CC) -E
+CPP ?= $(CC) -E
# What type of library to build? [0,1]
-SHARED := 0
+SHARED ?= 0
# Build wxUniversal instead of native port? [0,1]
-WXUNIV := 0
+WXUNIV ?= 0
# Compile Unicode build of wxWidgets? [0,1]
-UNICODE := 1
+UNICODE ?= 1
# Use MSLU library when building Unicode version. [0,1]
-MSLU := 0
+MSLU ?= 0
# Type of compiled binaries [debug,release]
-BUILD := debug
+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
+DEBUG_INFO ?= default
# Should __WXDEBUG__ be defined? The default value "default" means that it will
# be defined if BUILD=debug and not defined if BUILD=release. [0,1,default]
-DEBUG_FLAG := default
+DEBUG_FLAG ?= default
# Multiple libraries or single huge monolithic one? [0,1]
-MONOLITHIC := 0
+MONOLITHIC ?= 0
# Build GUI libraries? [0,1]
-USE_GUI := 1
+USE_GUI ?= 1
# Build wxHTML library (USE_GUI must be 1)? [0,1]
-USE_HTML := 1
+USE_HTML ?= 1
# Build multimedia library (USE_GUI must be 1)? [0,1]
-USE_MEDIA := 1
+USE_MEDIA ?= 1
# Build wxXRC library (USE_GUI must be 1)? [0,1]
-USE_XRC := 1
+USE_XRC ?= 1
# Build wxAUI library (USE_GUI must be 1)? [0,1]
-USE_AUI := 1
+USE_AUI ?= 1
# Build wxPropertyGrid library (USE_GUI must be 1)? [0,1]
-USE_PROPGRID := 1
+USE_PROPGRID ?= 1
# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1]
-USE_RICHTEXT := 1
+USE_RICHTEXT ?= 1
# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1]
-USE_STC := 1
+USE_STC ?= 1
# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
-USE_OPENGL := 0
+USE_OPENGL ?= 0
# Build quality assurance classes library (USE_GUI must be 1)? [0,1]
-USE_QA := 0
+USE_QA ?= 0
# Enable exceptions in compiled code. [0,1]
-USE_EXCEPTIONS := 1
+USE_EXCEPTIONS ?= 1
# Enable run-time type information (RTTI) in compiled code. [0,1]
-USE_RTTI := 1
+USE_RTTI ?= 1
# Enable threading in compiled code. [0,1]
-USE_THREADS := 1
+USE_THREADS ?= 1
# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1]
-USE_GDIPLUS := 0
+USE_GDIPLUS ?= 0
# Is this official build by wxWidgets developers? [0,1]
-OFFICIAL_BUILD := 0
+OFFICIAL_BUILD ?= 0
# Use this to name your customized DLLs differently
-VENDOR := custom
+VENDOR ?= custom
#
-WX_FLAVOUR :=
+WX_FLAVOUR ?=
#
-WX_LIB_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 :=
+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 :=
+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 :=
+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
+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
+GCC_VERSION ?= 3
diff --git a/build/msw/config.vc b/build/msw/config.vc
index b32d5b6864..f56906672e 100644
--- a/build/msw/config.vc
+++ b/build/msw/config.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This configuration file was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Beware that all changes made to this file will be overwritten next
# time you run Bakefile!
# =========================================================================
diff --git a/build/msw/config.wat b/build/msw/config.wat
index 16374f0c83..08667d4968 100644
--- a/build/msw/config.wat
+++ b/build/msw/config.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This configuration file was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Beware that all changes made to this file will be overwritten next
# time you run Bakefile!
# =========================================================================
diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 554b510c9b..4feb4045f6 100644
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -4347,7 +4347,7 @@ $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib: $(WXSCINTILLA_OBJECTS)
!if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(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)
- ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
+ ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(LDFLAGS) @&&|
c0d32.obj $(MONODLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_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 $(__wxscintilla) import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\monodll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) $@
@@ -4363,7 +4363,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)_bcc$(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
- ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
+ ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(LDFLAGS) @&&|
c0d32.obj $(BASEDLL_OBJECTS),$@,, 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_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\basedll_version.res
|
implib -f $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) $@
@@ -4383,7 +4383,7 @@ wxbase: $(____wxbase_namedll_DEP) $(____wxbase_namelib_DEP)
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_bcc$(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)
- ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
+ ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(LDFLAGS) @&&|
c0d32.obj $(NETDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\netdll_version.res
|
implib -f $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net $@
@@ -4403,7 +4403,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_bcc$(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)
- ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
+ ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(LDFLAGS) @&&|
c0d32.obj $(COREDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_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 $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\coredll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core $@
@@ -4423,7 +4423,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_bcc$(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)
- ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
+ ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(LDFLAGS) @&&|
c0d32.obj $(ADVDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_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 $(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 import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\advdll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv $@
@@ -4443,7 +4443,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_bcc$(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)
- ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
+ ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(LDFLAGS) @&&|
c0d32.obj $(MEDIADLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_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 $(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 import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\mediadll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media $@
@@ -4463,7 +4463,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_bcc$(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)
- ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
+ ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(LDFLAGS) @&&|
c0d32.obj $(HTMLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_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 $(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 import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\htmldll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html $@
@@ -4483,7 +4483,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_bcc$(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)
- ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
+ ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(LDFLAGS) @&&|
c0d32.obj $(QADLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_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 $(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 import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\qadll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa $@
@@ -4503,7 +4503,7 @@ wxqa: $(____wxqa_namedll_DEP) $(____wxqa_namelib_DEP)
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_bcc$(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)
- ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
+ ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(LDFLAGS) @&&|
c0d32.obj $(XMLDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\xmldll_version.res
|
implib -f $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml $@
@@ -4523,7 +4523,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_bcc$(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)
- ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
+ ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(LDFLAGS) @&&|
c0d32.obj $(XRCDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_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 $(__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 import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\xrcdll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc $@
@@ -4543,7 +4543,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_bcc$(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)
- ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
+ ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(LDFLAGS) @&&|
c0d32.obj $(AUIDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_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 $(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 import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\auidll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui $@
@@ -4563,7 +4563,7 @@ wxaui: $(____wxaui_namedll_DEP) $(____wxaui_namelib_DEP)
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_PROPGRID)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_bcc$(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)
- ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
+ ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(LDFLAGS) @&&|
c0d32.obj $(PROPGRIDDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_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 $(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 import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\propgriddll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid $@
@@ -4583,7 +4583,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_bcc$(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)
- ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
+ ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(LDFLAGS) @&&|
c0d32.obj $(RICHTEXTDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_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 $(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 import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\richtextdll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext $@
@@ -4603,7 +4603,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_bcc$(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)
- ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
+ ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(LDFLAGS) @&&|
c0d32.obj $(STCDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_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 $(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 import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\stcdll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc $@
@@ -4623,7 +4623,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_bcc$(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)
- ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
+ ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(LDFLAGS) @&&|
c0d32.obj $(GLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_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 $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\gldll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl $@
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 14db0c9b20..2677f95f56 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -28,7 +28,7 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
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)"
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
COMPILER_PREFIX = gcc
@@ -4423,7 +4423,7 @@ endif
ifeq ($(MONOLITHIC),1)
ifeq ($(SHARED),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\monodll_version_rc.o $(__wxscintilla_library_link_DEP)
- $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(MONODLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(__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 $(__wxscintilla)
+ $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(MONODLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(LDFLAGS) $(__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 $(__wxscintilla)
endif
endif
@@ -4439,7 +4439,7 @@ endif
ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),1)
$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\basedll_version_rc.o
- $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(BASEDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a -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
+ $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(BASEDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(LDFLAGS) -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
endif
endif
@@ -4459,7 +4459,7 @@ endif
ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),1)
$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_gcc$(VENDORTAG).dll: $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\netdll_version_rc.o $(__basedll___depname)
- $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(NETDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.a -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 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+ $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(NETDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.a $(LDFLAGS) -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 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
endif
endif
@@ -4480,7 +4480,7 @@ ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),1)
ifeq ($(USE_GUI),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_gcc$(VENDORTAG).dll: $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\coredll_version_rc.o $(__basedll___depname)
- $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(COREDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(__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 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+ $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(COREDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LDFLAGS) $(__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 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
endif
endif
endif
@@ -4506,7 +4506,7 @@ ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),1)
ifeq ($(USE_GUI),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_gcc$(VENDORTAG).dll: $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\advdll_version_rc.o $(__coredll___depname) $(__basedll___depname)
- $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(ADVDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(__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 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+ $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(ADVDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LDFLAGS) $(__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 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
endif
endif
endif
@@ -4533,7 +4533,7 @@ ifeq ($(SHARED),1)
ifeq ($(USE_GUI),1)
ifeq ($(USE_MEDIA),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_gcc$(VENDORTAG).dll: $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\mediadll_version_rc.o $(__coredll___depname) $(__basedll___depname)
- $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(MEDIADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a $(__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 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+ $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(MEDIADLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a $(LDFLAGS) $(__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 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
endif
endif
endif
@@ -4565,7 +4565,7 @@ ifeq ($(SHARED),1)
ifeq ($(USE_GUI),1)
ifeq ($(USE_HTML),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_gcc$(VENDORTAG).dll: $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\htmldll_version_rc.o $(__coredll___depname) $(__basedll___depname)
- $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(HTMLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a $(__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 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+ $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(HTMLDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a $(LDFLAGS) $(__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 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
endif
endif
endif
@@ -4595,7 +4595,7 @@ ifeq ($(SHARED),1)
ifeq ($(USE_GUI),1)
ifeq ($(USE_QA),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_gcc$(VENDORTAG).dll: $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\qadll_version_rc.o $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)
- $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(QADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.a $(__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 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a
+ $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(QADLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.a $(LDFLAGS) $(__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 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a
endif
endif
endif
@@ -4623,7 +4623,7 @@ endif
ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),1)
$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_gcc$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\xmldll_version_rc.o $(__basedll___depname)
- $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(XMLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a -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 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+ $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(XMLDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(LDFLAGS) -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 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
endif
endif
@@ -4644,7 +4644,7 @@ ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),1)
ifeq ($(USE_XRC),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_gcc$(VENDORTAG).dll: $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\xrcdll_version_rc.o $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
- $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(XRCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a $(__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 $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+ $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(XRCDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a $(LDFLAGS) $(__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 $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
endif
endif
endif
@@ -4670,7 +4670,7 @@ ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),1)
ifeq ($(USE_AUI),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_gcc$(VENDORTAG).dll: $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\auidll_version_rc.o $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
- $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(AUIDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.a $(__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 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+ $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(AUIDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.a $(LDFLAGS) $(__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 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
endif
endif
endif
@@ -4696,7 +4696,7 @@ ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),1)
ifeq ($(USE_PROPGRID),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_gcc$(VENDORTAG).dll: $(PROPGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\propgriddll_version_rc.o $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
- $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(PROPGRIDDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.a $(__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 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+ $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(PROPGRIDDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.a $(LDFLAGS) $(__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 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
endif
endif
endif
@@ -4722,7 +4722,7 @@ ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),1)
ifeq ($(USE_RICHTEXT),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_gcc$(VENDORTAG).dll: $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\richtextdll_version_rc.o $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname)
- $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(RICHTEXTDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.a $(__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 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+ $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(RICHTEXTDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.a $(LDFLAGS) $(__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 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
endif
endif
endif
@@ -4748,7 +4748,7 @@ ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),1)
ifeq ($(USE_STC),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_gcc$(VENDORTAG).dll: $(STCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__wxscintilla) $(OBJS)\stcdll_version_rc.o $(__coredll___depname) $(__basedll___depname)
- $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(STCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.a $(__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 $(LIBDIRNAME)\libwxscintilla$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+ $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(STCDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.a $(LDFLAGS) $(__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 $(LIBDIRNAME)\libwxscintilla$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
endif
endif
endif
@@ -4774,7 +4774,7 @@ ifeq ($(SHARED),1)
ifeq ($(USE_GUI),1)
ifeq ($(USE_OPENGL),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_gcc$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\gldll_version_rc.o $(__basedll___depname) $(__coredll___depname) $(__monodll___depname)
- $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(GLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a $(__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 $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) -lopengl32 -lglu32
+ $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(GLDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a $(LDFLAGS) $(__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 $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) -lopengl32 -lglu32
endif
endif
endif
@@ -14713,7 +14713,8 @@ $(OBJS)\gllib_glcmn.o: ../../src/common/glcmn.cpp
$(OBJS)\gllib_glcanvas.o: ../../src/msw/glcanvas.cpp
$(CXX) -c -o $@ $(GLLIB_CXXFLAGS) $(CPPDEPS) $<
-.PHONY: all clean setup_h wxbase wxnet wxcore wxadv wxmedia wxhtml wxqa wxxml wxxrc wxaui wxpropgrid wxrichtext wxstc wxgl samples build_cfg_file
+.PHONY: all clean setup_h wxbase wxnet wxcore wxadv wxmedia wxhtml wxqa wxxml wxxrc \
+ wxaui wxpropgrid wxrichtext wxstc wxgl samples build_cfg_file
SHELL := $(COMSPEC)
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index d481bbb88b..fa84ac1eeb 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -1487,18 +1487,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -1508,18 +1508,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(RUNTIME_LIBS)" == "dynamic"
__RUNTIME_LIBS_8 = D
!endif
@@ -4709,7 +4709,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:$@ $(LDFLAGS) $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+ 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) @<<
$(MONODLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_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 $(__wxscintilla) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
<<
!endif
@@ -4724,7 +4724,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:$@ $(LDFLAGS) $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+ 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) @<<
$(BASEDLL_OBJECTS) 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 /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
<<
!endif
@@ -4743,7 +4743,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:$@ $(LDFLAGS) $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+ 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) @<<
$(NETDLL_OBJECTS) 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 $(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
@@ -4762,7 +4762,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:$@ $(LDFLAGS) $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+ 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) @<<
$(COREDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_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 $(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
@@ -4781,7 +4781,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:$@ $(LDFLAGS) $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+ 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) @<<
$(ADVDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_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 $(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
@@ -4800,7 +4800,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:$@ $(LDFLAGS) $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+ 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) @<<
$(MEDIADLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_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 $(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
@@ -4819,7 +4819,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:$@ $(LDFLAGS) $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+ 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) @<<
$(HTMLDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_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 $(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
@@ -4838,7 +4838,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:$@ $(LDFLAGS) $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+ 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) @<<
$(QADLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_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 $(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
@@ -4857,7 +4857,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:$@ $(LDFLAGS) $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+ 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) @<<
$(XMLDLL_OBJECTS) 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 $(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
@@ -4876,7 +4876,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:$@ $(LDFLAGS) $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+ 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) @<<
$(XRCDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_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 $(__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
@@ -4895,7 +4895,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:$@ $(LDFLAGS) $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+ 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) @<<
$(AUIDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_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 $(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
@@ -4914,7 +4914,7 @@ wxaui: $(____wxaui_namedll_DEP) $(____wxaui_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:$@ $(LDFLAGS) $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+ 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) @<<
$(PROPGRIDDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_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 $(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
@@ -4933,7 +4933,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:$@ $(LDFLAGS) $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+ 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) @<<
$(RICHTEXTDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_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 $(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
@@ -4952,7 +4952,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:$@ $(LDFLAGS) $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+ 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) @<<
$(STCDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_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 $(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
@@ -4971,7 +4971,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:$@ $(LDFLAGS) $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+ 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) @<<
$(GLDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_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 $(__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
diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index 491aedae4b..84ed250e93 100644
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -4520,7 +4520,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\monodll.lbc option quiet
@%append $(OBJS)\monodll.lbc name $^@
@%append $(OBJS)\monodll.lbc option caseexact
- @%append $(OBJS)\monodll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME)
+ @%append $(OBJS)\monodll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS)
@for %i in ($(MONODLL_OBJECTS)) do @%append $(OBJS)\monodll.lbc file %i
@for %i in ( $(__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 $(__wxscintilla)) do @%append $(OBJS)\monodll.lbc library %i
@%append $(OBJS)\monodll.lbc option resource=$(OBJS)\monodll_version.res
@@ -4546,7 +4546,7 @@ $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL
@%append $(OBJS)\basedll.lbc option quiet
@%append $(OBJS)\basedll.lbc name $^@
@%append $(OBJS)\basedll.lbc option caseexact
- @%append $(OBJS)\basedll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME)
+ @%append $(OBJS)\basedll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS)
@for %i in ($(BASEDLL_OBJECTS)) do @%append $(OBJS)\basedll.lbc file %i
@for %i in ( 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) do @%append $(OBJS)\basedll.lbc library %i
@%append $(OBJS)\basedll.lbc option resource=$(OBJS)\basedll_version.res
@@ -4576,7 +4576,7 @@ $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL
@%append $(OBJS)\netdll.lbc option quiet
@%append $(OBJS)\netdll.lbc name $^@
@%append $(OBJS)\netdll.lbc option caseexact
- @%append $(OBJS)\netdll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME)
+ @%append $(OBJS)\netdll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS)
@for %i in ($(NETDLL_OBJECTS)) do @%append $(OBJS)\netdll.lbc file %i
@for %i in ( 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 $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\netdll.lbc library %i
@%append $(OBJS)\netdll.lbc option resource=$(OBJS)\netdll_version.res
@@ -4607,7 +4607,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\coredll.lbc option quiet
@%append $(OBJS)\coredll.lbc name $^@
@%append $(OBJS)\coredll.lbc option caseexact
- @%append $(OBJS)\coredll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME)
+ @%append $(OBJS)\coredll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS)
@for %i in ($(COREDLL_OBJECTS)) do @%append $(OBJS)\coredll.lbc file %i
@for %i in ( $(__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 $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\coredll.lbc library %i
@%append $(OBJS)\coredll.lbc option resource=$(OBJS)\coredll_version.res
@@ -4643,7 +4643,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\advdll.lbc option quiet
@%append $(OBJS)\advdll.lbc name $^@
@%append $(OBJS)\advdll.lbc option caseexact
- @%append $(OBJS)\advdll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME)
+ @%append $(OBJS)\advdll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS)
@for %i in ($(ADVDLL_OBJECTS)) do @%append $(OBJS)\advdll.lbc file %i
@for %i in ( $(__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 $(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 ) do @%append $(OBJS)\advdll.lbc library %i
@%append $(OBJS)\advdll.lbc option resource=$(OBJS)\advdll_version.res
@@ -4680,7 +4680,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\mediadll.lbc option quiet
@%append $(OBJS)\mediadll.lbc name $^@
@%append $(OBJS)\mediadll.lbc option caseexact
- @%append $(OBJS)\mediadll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME)
+ @%append $(OBJS)\mediadll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS)
@for %i in ($(MEDIADLL_OBJECTS)) do @%append $(OBJS)\mediadll.lbc file %i
@for %i in ( $(__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 $(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 ) do @%append $(OBJS)\mediadll.lbc library %i
@%append $(OBJS)\mediadll.lbc option resource=$(OBJS)\mediadll_version.res
@@ -4722,7 +4722,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\htmldll.lbc option quiet
@%append $(OBJS)\htmldll.lbc name $^@
@%append $(OBJS)\htmldll.lbc option caseexact
- @%append $(OBJS)\htmldll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME)
+ @%append $(OBJS)\htmldll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS)
@for %i in ($(HTMLDLL_OBJECTS)) do @%append $(OBJS)\htmldll.lbc file %i
@for %i in ( $(__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 $(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 ) do @%append $(OBJS)\htmldll.lbc library %i
@%append $(OBJS)\htmldll.lbc option resource=$(OBJS)\htmldll_version.res
@@ -4762,7 +4762,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\qadll.lbc option quiet
@%append $(OBJS)\qadll.lbc name $^@
@%append $(OBJS)\qadll.lbc option caseexact
- @%append $(OBJS)\qadll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME)
+ @%append $(OBJS)\qadll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS)
@for %i in ($(QADLL_OBJECTS)) do @%append $(OBJS)\qadll.lbc file %i
@for %i in ( $(__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 $(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) do @%append $(OBJS)\qadll.lbc library %i
@%append $(OBJS)\qadll.lbc option resource=$(OBJS)\qadll_version.res
@@ -4800,7 +4800,7 @@ $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL
@%append $(OBJS)\xmldll.lbc option quiet
@%append $(OBJS)\xmldll.lbc name $^@
@%append $(OBJS)\xmldll.lbc option caseexact
- @%append $(OBJS)\xmldll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME)
+ @%append $(OBJS)\xmldll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS)
@for %i in ($(XMLDLL_OBJECTS)) do @%append $(OBJS)\xmldll.lbc file %i
@for %i in ( 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 $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\xmldll.lbc library %i
@%append $(OBJS)\xmldll.lbc option resource=$(OBJS)\xmldll_version.res
@@ -4831,7 +4831,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\xrcdll.lbc option quiet
@%append $(OBJS)\xrcdll.lbc name $^@
@%append $(OBJS)\xrcdll.lbc option caseexact
- @%append $(OBJS)\xrcdll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME)
+ @%append $(OBJS)\xrcdll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS)
@for %i in ($(XRCDLL_OBJECTS)) do @%append $(OBJS)\xrcdll.lbc file %i
@for %i in ( $(__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 $(__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) do @%append $(OBJS)\xrcdll.lbc library %i
@%append $(OBJS)\xrcdll.lbc option resource=$(OBJS)\xrcdll_version.res
@@ -4867,7 +4867,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\auidll.lbc option quiet
@%append $(OBJS)\auidll.lbc name $^@
@%append $(OBJS)\auidll.lbc option caseexact
- @%append $(OBJS)\auidll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME)
+ @%append $(OBJS)\auidll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS)
@for %i in ($(AUIDLL_OBJECTS)) do @%append $(OBJS)\auidll.lbc file %i
@for %i in ( $(__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 $(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) do @%append $(OBJS)\auidll.lbc library %i
@%append $(OBJS)\auidll.lbc option resource=$(OBJS)\auidll_version.res
@@ -4903,7 +4903,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\propgriddll.lbc option quiet
@%append $(OBJS)\propgriddll.lbc name $^@
@%append $(OBJS)\propgriddll.lbc option caseexact
- @%append $(OBJS)\propgriddll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME)
+ @%append $(OBJS)\propgriddll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS)
@for %i in ($(PROPGRIDDLL_OBJECTS)) do @%append $(OBJS)\propgriddll.lbc file %i
@for %i in ( $(__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 $(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) do @%append $(OBJS)\propgriddll.lbc library %i
@%append $(OBJS)\propgriddll.lbc option resource=$(OBJS)\propgriddll_version.res
@@ -4939,7 +4939,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\richtextdll.lbc option quiet
@%append $(OBJS)\richtextdll.lbc name $^@
@%append $(OBJS)\richtextdll.lbc option caseexact
- @%append $(OBJS)\richtextdll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME)
+ @%append $(OBJS)\richtextdll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS)
@for %i in ($(RICHTEXTDLL_OBJECTS)) do @%append $(OBJS)\richtextdll.lbc file %i
@for %i in ( $(__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 $(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) do @%append $(OBJS)\richtextdll.lbc library %i
@%append $(OBJS)\richtextdll.lbc option resource=$(OBJS)\richtextdll_version.res
@@ -4975,7 +4975,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\stcdll.lbc option quiet
@%append $(OBJS)\stcdll.lbc name $^@
@%append $(OBJS)\stcdll.lbc option caseexact
- @%append $(OBJS)\stcdll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME)
+ @%append $(OBJS)\stcdll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS)
@for %i in ($(STCDLL_OBJECTS)) do @%append $(OBJS)\stcdll.lbc file %i
@for %i in ( $(__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 $(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) do @%append $(OBJS)\stcdll.lbc library %i
@%append $(OBJS)\stcdll.lbc option resource=$(OBJS)\stcdll_version.res
@@ -5011,7 +5011,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\gldll.lbc option quiet
@%append $(OBJS)\gldll.lbc name $^@
@%append $(OBJS)\gldll.lbc option caseexact
- @%append $(OBJS)\gldll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME)
+ @%append $(OBJS)\gldll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS)
@for %i in ($(GLDLL_OBJECTS)) do @%append $(OBJS)\gldll.lbc file %i
@for %i in ( $(__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 $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib) do @%append $(OBJS)\gldll.lbc library %i
@%append $(OBJS)\gldll.lbc option resource=$(OBJS)\gldll_version.res
diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp
index 8bf8393d6b..e7135aa8b5 100644
--- a/build/msw/wx_base.dsp
+++ b/build/msw/wx_base.dsp
@@ -1275,6 +1275,10 @@ SOURCE=..\..\include\wx\ipcbase.h
# End Source File
# Begin Source File
+SOURCE=..\..\include\wx\kbdstate.h
+# End Source File
+# Begin Source File
+
SOURCE=..\..\include\wx\link.h
# End Source File
# Begin Source File
@@ -1315,6 +1319,10 @@ SOURCE=..\..\include\wx\module.h
# End Source File
# Begin Source File
+SOURCE=..\..\include\wx\mousestate.h
+# End Source File
+# Begin Source File
+
SOURCE=..\..\include\wx\meta\movable.h
# End Source File
# Begin Source File
diff --git a/build/msw/wx_vc7_adv.vcproj b/build/msw/wx_vc7_adv.vcproj
index 55d67b1f98..c4e8caf6e4 100644
--- a/build/msw/wx_vc7_adv.vcproj
+++ b/build/msw/wx_vc7_adv.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,32 +22,16 @@
IntermediateDirectory="vc_mswunivudll\adv"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivudll\wxprec_advdll.pch"
@@ -55,40 +39,46 @@
ObjectFile="vc_mswunivudll\adv\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_adv_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290u_adv_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_adv.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_adv_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_adv.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -96,32 +86,19 @@
IntermediateDirectory="vc_mswunivuddll\adv"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivuddll\wxprec_advdll.pch"
@@ -129,40 +106,46 @@
ObjectFile="vc_mswunivuddll\adv\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_adv_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_adv_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_adv.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_adv_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_adv.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -170,32 +153,16 @@
IntermediateDirectory="vc_mswudll\adv"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_advdll.pch"
@@ -203,40 +170,46 @@
ObjectFile="vc_mswudll\adv\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_adv_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290u_adv_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29u_adv.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_adv_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_adv.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -244,32 +217,19 @@
IntermediateDirectory="vc_mswuddll\adv"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_advdll.pch"
@@ -277,40 +237,46 @@
ObjectFile="vc_mswuddll\adv\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_adv_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290ud_adv_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_adv.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290ud_adv_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_adv.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -318,32 +284,16 @@
IntermediateDirectory="vc_mswunivu\adv"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivu\wxprec_advlib.pch"
@@ -351,32 +301,38 @@
ObjectFile="vc_mswunivu\adv\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_adv.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmswuniv29u_adv.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmswuniv29u_adv.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_adv.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -384,32 +340,19 @@
IntermediateDirectory="vc_mswunivud\adv"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivud\wxprec_advlib.pch"
@@ -417,32 +360,38 @@
ObjectFile="vc_mswunivud\adv\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_adv.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_adv.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_adv.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_adv.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -450,32 +399,16 @@
IntermediateDirectory="vc_mswu\adv"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswu\wxprec_advlib.pch"
@@ -483,32 +416,38 @@
ObjectFile="vc_mswu\adv\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_adv.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmsw29u_adv.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmsw29u_adv.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_adv.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -516,32 +455,19 @@
IntermediateDirectory="vc_mswud\adv"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswud\wxprec_advlib.pch"
@@ -549,32 +475,38 @@
ObjectFile="vc_mswud\adv\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_adv.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmsw29ud_adv.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmsw29ud_adv.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_adv.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -585,13 +517,17 @@
Name="Common Sources"
UniqueIdentifier="{A6A5C30D-BDB6-5050-906D-10A96065136C}">
<File
- RelativePath="..\..\src\common\animatecmn.cpp"/>
+ RelativePath="..\..\src\common\animatecmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\bmpcboxcmn.cpp"/>
+ RelativePath="..\..\src\common\bmpcboxcmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\calctrlcmn.cpp"/>
+ RelativePath="..\..\src\common\calctrlcmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\datavcmn.cpp"/>
+ RelativePath="..\..\src\common\datavcmn.cpp">
+ </File>
<File
RelativePath="..\..\src\common\dummy.cpp">
<FileConfiguration
@@ -644,142 +580,169 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\common\hyperlnkcmn.cpp"/>
+ RelativePath="..\..\src\common\hyperlnkcmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\taskbarcmn.cpp"/>
+ RelativePath="..\..\src\common\taskbarcmn.cpp">
+ </File>
</Filter>
<Filter
Name="MSW Sources"
UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}">
<File
- RelativePath="..\..\src\msw\aboutdlg.cpp"/>
+ RelativePath="..\..\src\msw\aboutdlg.cpp">
+ </File>
<File
RelativePath="..\..\src\msw\bmpcbox.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\msw\calctrl.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\msw\datecontrols.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\msw\datectrl.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
- RelativePath="..\..\src\msw\joystick.cpp"/>
+ RelativePath="..\..\src\msw\joystick.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\notifmsg.cpp"/>
+ RelativePath="..\..\src\msw\notifmsg.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\sound.cpp"/>
+ RelativePath="..\..\src\msw\sound.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\taskbar.cpp"/>
+ RelativePath="..\..\src\msw\taskbar.cpp">
+ </File>
<File
RelativePath="..\..\src\msw\version.rc">
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
</Filter>
<Filter
Name="Generic Sources"
UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}">
<File
- RelativePath="..\..\src\generic\aboutdlgg.cpp"/>
+ RelativePath="..\..\src\generic\aboutdlgg.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\animateg.cpp"/>
+ RelativePath="..\..\src\generic\animateg.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\bmpcboxg.cpp"/>
+ RelativePath="..\..\src\generic\bmpcboxg.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\calctrlg.cpp"/>
+ RelativePath="..\..\src\generic\calctrlg.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\datavgen.cpp"/>
+ RelativePath="..\..\src\generic\datavgen.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\datectlg.cpp"/>
+ RelativePath="..\..\src\generic\datectlg.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\editlbox.cpp"/>
+ RelativePath="..\..\src\generic\editlbox.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\grid.cpp"/>
+ RelativePath="..\..\src\generic\grid.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\gridctrl.cpp"/>
+ RelativePath="..\..\src\generic\gridctrl.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\gridsel.cpp"/>
+ RelativePath="..\..\src\generic\gridsel.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\helpext.cpp"/>
+ RelativePath="..\..\src\generic\helpext.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\hyperlinkg.cpp"/>
+ RelativePath="..\..\src\generic\hyperlinkg.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\laywin.cpp"/>
+ RelativePath="..\..\src\generic\laywin.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\notifmsgg.cpp"/>
+ RelativePath="..\..\src\generic\notifmsgg.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\odcombo.cpp"/>
+ RelativePath="..\..\src\generic\odcombo.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\propdlg.cpp"/>
+ RelativePath="..\..\src\generic\propdlg.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\sashwin.cpp"/>
+ RelativePath="..\..\src\generic\sashwin.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\splash.cpp"/>
+ RelativePath="..\..\src\generic\splash.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\tipdlg.cpp"/>
+ RelativePath="..\..\src\generic\tipdlg.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\wizard.cpp"/>
+ RelativePath="..\..\src\generic\wizard.cpp">
+ </File>
</Filter>
<Filter
Name="Setup Headers"
@@ -883,13 +846,17 @@
Name="MSW Headers"
UniqueIdentifier="{5AFFF20E-29F9-512B-B80A-7DC45976CDAC}">
<File
- RelativePath="..\..\include\wx\msw\bmpcbox.h"/>
+ RelativePath="..\..\include\wx\msw\bmpcbox.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\calctrl.h"/>
+ RelativePath="..\..\include\wx\msw\calctrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\datecontrols.h"/>
+ RelativePath="..\..\include\wx\msw\datecontrols.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\datectrl.h"/>
+ RelativePath="..\..\include\wx\msw\datectrl.h">
+ </File>
<File
RelativePath="..\..\include\wx\msw\genrcdefs.h">
<FileConfiguration
@@ -966,99 +933,142 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\include\wx\msw\joystick.h"/>
+ RelativePath="..\..\include\wx\msw\joystick.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\notifmsg.h"/>
+ RelativePath="..\..\include\wx\msw\notifmsg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\sound.h"/>
+ RelativePath="..\..\include\wx\msw\sound.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\taskbar.h"/>
+ RelativePath="..\..\include\wx\msw\taskbar.h">
+ </File>
</Filter>
<Filter
Name="Generic Headers"
UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}">
<File
- RelativePath="..\..\include\wx\generic\aboutdlgg.h"/>
+ RelativePath="..\..\include\wx\generic\aboutdlgg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\animate.h"/>
+ RelativePath="..\..\include\wx\generic\animate.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\bmpcbox.h"/>
+ RelativePath="..\..\include\wx\generic\bmpcbox.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\calctrlg.h"/>
+ RelativePath="..\..\include\wx\generic\calctrlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\dataview.h"/>
+ RelativePath="..\..\include\wx\generic\dataview.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\datectrl.h"/>
+ RelativePath="..\..\include\wx\generic\datectrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\grid.h"/>
+ RelativePath="..\..\include\wx\generic\grid.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\gridctrl.h"/>
+ RelativePath="..\..\include\wx\generic\gridctrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\gridsel.h"/>
+ RelativePath="..\..\include\wx\generic\gridsel.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\helpext.h"/>
+ RelativePath="..\..\include\wx\generic\helpext.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\hyperlink.h"/>
+ RelativePath="..\..\include\wx\generic\hyperlink.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\laywin.h"/>
+ RelativePath="..\..\include\wx\generic\laywin.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\notifmsg.h"/>
+ RelativePath="..\..\include\wx\generic\notifmsg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\propdlg.h"/>
+ RelativePath="..\..\include\wx\generic\propdlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\sashwin.h"/>
+ RelativePath="..\..\include\wx\generic\sashwin.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\splash.h"/>
+ RelativePath="..\..\include\wx\generic\splash.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\wizard.h"/>
+ RelativePath="..\..\include\wx\generic\wizard.h">
+ </File>
</Filter>
<Filter
Name="Common Headers"
UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}">
<File
- RelativePath="..\..\include\wx\aboutdlg.h"/>
+ RelativePath="..\..\include\wx\aboutdlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\animate.h"/>
+ RelativePath="..\..\include\wx\animate.h">
+ </File>
<File
- RelativePath="..\..\include\wx\bmpcbox.h"/>
+ RelativePath="..\..\include\wx\bmpcbox.h">
+ </File>
<File
- RelativePath="..\..\include\wx\calctrl.h"/>
+ RelativePath="..\..\include\wx\calctrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\dataview.h"/>
+ RelativePath="..\..\include\wx\dataview.h">
+ </File>
<File
- RelativePath="..\..\include\wx\datectrl.h"/>
+ RelativePath="..\..\include\wx\datectrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\dateevt.h"/>
+ RelativePath="..\..\include\wx\dateevt.h">
+ </File>
<File
- RelativePath="..\..\include\wx\dcbuffer.h"/>
+ RelativePath="..\..\include\wx\dcbuffer.h">
+ </File>
<File
- RelativePath="..\..\include\wx\editlbox.h"/>
+ RelativePath="..\..\include\wx\editlbox.h">
+ </File>
<File
- RelativePath="..\..\include\wx\grid.h"/>
+ RelativePath="..\..\include\wx\grid.h">
+ </File>
<File
- RelativePath="..\..\include\wx\hyperlink.h"/>
+ RelativePath="..\..\include\wx\hyperlink.h">
+ </File>
<File
- RelativePath="..\..\include\wx\joystick.h"/>
+ RelativePath="..\..\include\wx\joystick.h">
+ </File>
<File
- RelativePath="..\..\include\wx\laywin.h"/>
+ RelativePath="..\..\include\wx\laywin.h">
+ </File>
<File
- RelativePath="..\..\include\wx\notifmsg.h"/>
+ RelativePath="..\..\include\wx\notifmsg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\odcombo.h"/>
+ RelativePath="..\..\include\wx\odcombo.h">
+ </File>
<File
- RelativePath="..\..\include\wx\propdlg.h"/>
+ RelativePath="..\..\include\wx\propdlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\sashwin.h"/>
+ RelativePath="..\..\include\wx\sashwin.h">
+ </File>
<File
- RelativePath="..\..\include\wx\sound.h"/>
+ RelativePath="..\..\include\wx\sound.h">
+ </File>
<File
- RelativePath="..\..\include\wx\splash.h"/>
+ RelativePath="..\..\include\wx\splash.h">
+ </File>
<File
- RelativePath="..\..\include\wx\taskbar.h"/>
+ RelativePath="..\..\include\wx\taskbar.h">
+ </File>
<File
- RelativePath="..\..\include\wx\tipdlg.h"/>
+ RelativePath="..\..\include\wx\tipdlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\wizard.h"/>
+ RelativePath="..\..\include\wx\wizard.h">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc7_aui.vcproj b/build/msw/wx_vc7_aui.vcproj
index 0e0f9c9c8a..8bcb5b3b9d 100644
--- a/build/msw/wx_vc7_aui.vcproj
+++ b/build/msw/wx_vc7_aui.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,32 +22,16 @@
IntermediateDirectory="vc_mswunivudll\aui"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivudll\wxprec_auidll.pch"
@@ -55,40 +39,46 @@
ObjectFile="vc_mswunivudll\aui\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_aui_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290u_aui_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_aui.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_aui_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_aui.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -96,32 +86,19 @@
IntermediateDirectory="vc_mswunivuddll\aui"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivuddll\wxprec_auidll.pch"
@@ -129,40 +106,46 @@
ObjectFile="vc_mswunivuddll\aui\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_aui_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_aui_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_aui.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_aui_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_aui.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -170,32 +153,16 @@
IntermediateDirectory="vc_mswudll\aui"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_auidll.pch"
@@ -203,40 +170,46 @@
ObjectFile="vc_mswudll\aui\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_aui_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290u_aui_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29u_aui.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_aui_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_aui.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -244,32 +217,19 @@
IntermediateDirectory="vc_mswuddll\aui"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_auidll.pch"
@@ -277,40 +237,46 @@
ObjectFile="vc_mswuddll\aui\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_aui_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290ud_aui_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_aui.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290ud_aui_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_aui.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -318,32 +284,16 @@
IntermediateDirectory="vc_mswunivu\aui"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivu\wxprec_auilib.pch"
@@ -351,32 +301,38 @@
ObjectFile="vc_mswunivu\aui\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_aui.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmswuniv29u_aui.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmswuniv29u_aui.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_aui.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -384,32 +340,19 @@
IntermediateDirectory="vc_mswunivud\aui"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivud\wxprec_auilib.pch"
@@ -417,32 +360,38 @@
ObjectFile="vc_mswunivud\aui\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_aui.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_aui.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_aui.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_aui.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -450,32 +399,16 @@
IntermediateDirectory="vc_mswu\aui"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswu\wxprec_auilib.pch"
@@ -483,32 +416,38 @@
ObjectFile="vc_mswu\aui\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_aui.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmsw29u_aui.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmsw29u_aui.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_aui.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -516,32 +455,19 @@
IntermediateDirectory="vc_mswud\aui"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswud\wxprec_auilib.pch"
@@ -549,32 +475,38 @@
ObjectFile="vc_mswud\aui\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_aui.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmsw29ud_aui.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmsw29ud_aui.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_aui.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -643,16 +575,16 @@
RelativePath="..\..\src\msw\version.rc">
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
</Filter>
<Filter
@@ -836,36 +768,49 @@
Name="Common Headers"
UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}">
<File
- RelativePath="..\..\include\wx\aui\aui.h"/>
+ RelativePath="..\..\include\wx\aui\aui.h">
+ </File>
<File
- RelativePath="..\..\include\wx\aui\auibar.h"/>
+ RelativePath="..\..\include\wx\aui\auibar.h">
+ </File>
<File
- RelativePath="..\..\include\wx\aui\auibook.h"/>
+ RelativePath="..\..\include\wx\aui\auibook.h">
+ </File>
<File
- RelativePath="..\..\include\wx\aui\dockart.h"/>
+ RelativePath="..\..\include\wx\aui\dockart.h">
+ </File>
<File
- RelativePath="..\..\include\wx\aui\floatpane.h"/>
+ RelativePath="..\..\include\wx\aui\floatpane.h">
+ </File>
<File
- RelativePath="..\..\include\wx\aui\framemanager.h"/>
+ RelativePath="..\..\include\wx\aui\framemanager.h">
+ </File>
<File
- RelativePath="..\..\include\wx\aui\tabmdi.h"/>
+ RelativePath="..\..\include\wx\aui\tabmdi.h">
+ </File>
</Filter>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath="..\..\src\aui\auibar.cpp"/>
+ RelativePath="..\..\src\aui\auibar.cpp">
+ </File>
<File
- RelativePath="..\..\src\aui\auibook.cpp"/>
+ RelativePath="..\..\src\aui\auibook.cpp">
+ </File>
<File
- RelativePath="..\..\src\aui\dockart.cpp"/>
+ RelativePath="..\..\src\aui\dockart.cpp">
+ </File>
<File
- RelativePath="..\..\src\aui\floatpane.cpp"/>
+ RelativePath="..\..\src\aui\floatpane.cpp">
+ </File>
<File
- RelativePath="..\..\src\aui\framemanager.cpp"/>
+ RelativePath="..\..\src\aui\framemanager.cpp">
+ </File>
<File
- RelativePath="..\..\src\aui\tabmdi.cpp"/>
+ RelativePath="..\..\src\aui\tabmdi.cpp">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc7_base.vcproj b/build/msw/wx_vc7_base.vcproj
index 92f2d19a72..23f2b71c74 100644
--- a/build/msw/wx_vc7_base.vcproj
+++ b/build/msw/wx_vc7_base.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,32 +22,16 @@
IntermediateDirectory="vc_mswunivudll\base"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivudll\wxprec_basedll.pch"
@@ -55,40 +39,46 @@
ObjectFile="vc_mswunivudll\base\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290u_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
OutputFile="..\..\lib\vc_dll\wxbase290u_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290u_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_base.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -96,32 +86,19 @@
IntermediateDirectory="vc_mswunivuddll\base"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivuddll\wxprec_basedll.pch"
@@ -129,40 +106,46 @@
ObjectFile="vc_mswunivuddll\base\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290ud_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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"
AdditionalOptions=""
+ AdditionalDependencies="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"
OutputFile="..\..\lib\vc_dll\wxbase290ud_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase29ud.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290ud_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_base.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -170,32 +153,16 @@
IntermediateDirectory="vc_mswudll\base"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_basedll.pch"
@@ -203,40 +170,46 @@
ObjectFile="vc_mswudll\base\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290u_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
OutputFile="..\..\lib\vc_dll\wxbase290u_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290u_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_base.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -244,32 +217,19 @@
IntermediateDirectory="vc_mswuddll\base"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_basedll.pch"
@@ -277,40 +237,46 @@
ObjectFile="vc_mswuddll\base\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290ud_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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"
AdditionalOptions=""
+ AdditionalDependencies="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"
OutputFile="..\..\lib\vc_dll\wxbase290ud_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase29ud.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290ud_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_base.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -318,32 +284,16 @@
IntermediateDirectory="vc_mswunivu\base"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivu\wxprec_baselib.pch"
@@ -351,32 +301,38 @@
ObjectFile="vc_mswunivu\base\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29u.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxbase29u.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxbase29u.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_base.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -384,32 +340,19 @@
IntermediateDirectory="vc_mswunivud\base"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivud\wxprec_baselib.pch"
@@ -417,32 +360,38 @@
ObjectFile="vc_mswunivud\base\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29ud.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxbase29ud.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxbase29ud.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_base.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -450,32 +399,16 @@
IntermediateDirectory="vc_mswu\base"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswu\wxprec_baselib.pch"
@@ -483,32 +416,38 @@
ObjectFile="vc_mswu\base\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29u.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxbase29u.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxbase29u.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_base.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -516,32 +455,19 @@
IntermediateDirectory="vc_mswud\base"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswud\wxprec_baselib.pch"
@@ -549,32 +475,38 @@
ObjectFile="vc_mswud\base\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29ud.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxbase29ud.lib"
+ SuppressStartupBanner="TRUE"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxbase29ud.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_base.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -585,31 +517,44 @@
Name="Common Sources"
UniqueIdentifier="{A6A5C30D-BDB6-5050-906D-10A96065136C}">
<File
- RelativePath="..\..\src\common\appbase.cpp"/>
+ RelativePath="..\..\src\common\appbase.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\arcall.cpp"/>
+ RelativePath="..\..\src\common\arcall.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\arcfind.cpp"/>
+ RelativePath="..\..\src\common\arcfind.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\archive.cpp"/>
+ RelativePath="..\..\src\common\archive.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\arrstr.cpp"/>
+ RelativePath="..\..\src\common\arrstr.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\base64.cpp"/>
+ RelativePath="..\..\src\common\base64.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\clntdata.cpp"/>
+ RelativePath="..\..\src\common\clntdata.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\cmdline.cpp"/>
+ RelativePath="..\..\src\common\cmdline.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\config.cpp"/>
+ RelativePath="..\..\src\common\config.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\convauto.cpp"/>
+ RelativePath="..\..\src\common\convauto.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\datetime.cpp"/>
+ RelativePath="..\..\src\common\datetime.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\datstrm.cpp"/>
+ RelativePath="..\..\src\common\datstrm.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\dircmn.cpp"/>
+ RelativePath="..\..\src\common\dircmn.cpp">
+ </File>
<File
RelativePath="..\..\src\common\dummy.cpp">
<FileConfiguration
@@ -662,17 +607,23 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\common\dynarray.cpp"/>
+ RelativePath="..\..\src\common\dynarray.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\dynlib.cpp"/>
+ RelativePath="..\..\src\common\dynlib.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\dynload.cpp"/>
+ RelativePath="..\..\src\common\dynload.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\encconv.cpp"/>
+ RelativePath="..\..\src\common\encconv.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\event.cpp"/>
+ RelativePath="..\..\src\common\event.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\evtloopcmn.cpp"/>
+ RelativePath="..\..\src\common\evtloopcmn.cpp">
+ </File>
<File
RelativePath="..\..\src\common\extended.c">
<FileConfiguration
@@ -725,188 +676,270 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\common\ffile.cpp"/>
+ RelativePath="..\..\src\common\ffile.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\file.cpp"/>
+ RelativePath="..\..\src\common\file.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\fileback.cpp"/>
+ RelativePath="..\..\src\common\fileback.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\fileconf.cpp"/>
+ RelativePath="..\..\src\common\fileconf.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\filefn.cpp"/>
+ RelativePath="..\..\src\common\filefn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\filename.cpp"/>
+ RelativePath="..\..\src\common\filename.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\filesys.cpp"/>
+ RelativePath="..\..\src\common\filesys.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\filtall.cpp"/>
+ RelativePath="..\..\src\common\filtall.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\filtfind.cpp"/>
+ RelativePath="..\..\src\common\filtfind.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\fmapbase.cpp"/>
+ RelativePath="..\..\src\common\fmapbase.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\fs_arc.cpp"/>
+ RelativePath="..\..\src\common\fs_arc.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\fs_filter.cpp"/>
+ RelativePath="..\..\src\common\fs_filter.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\fs_mem.cpp"/>
+ RelativePath="..\..\src\common\fs_mem.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\hash.cpp"/>
+ RelativePath="..\..\src\common\hash.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\hashmap.cpp"/>
+ RelativePath="..\..\src\common\hashmap.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\init.cpp"/>
+ RelativePath="..\..\src\common\init.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\intl.cpp"/>
+ RelativePath="..\..\src\common\intl.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\ipcbase.cpp"/>
+ RelativePath="..\..\src\common\ipcbase.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\list.cpp"/>
+ RelativePath="..\..\src\common\list.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\log.cpp"/>
+ RelativePath="..\..\src\common\log.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\longlong.cpp"/>
+ RelativePath="..\..\src\common\longlong.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\memory.cpp"/>
+ RelativePath="..\..\src\common\memory.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\mimecmn.cpp"/>
+ RelativePath="..\..\src\common\mimecmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\module.cpp"/>
+ RelativePath="..\..\src\common\module.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\msgout.cpp"/>
+ RelativePath="..\..\src\common\msgout.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\mstream.cpp"/>
+ RelativePath="..\..\src\common\mstream.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\object.cpp"/>
+ RelativePath="..\..\src\common\object.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\platinfo.cpp"/>
+ RelativePath="..\..\src\common\platinfo.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\powercmn.cpp"/>
+ RelativePath="..\..\src\common\powercmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\process.cpp"/>
+ RelativePath="..\..\src\common\process.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\regex.cpp"/>
+ RelativePath="..\..\src\common\regex.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\sstream.cpp"/>
+ RelativePath="..\..\src\common\sstream.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\stdpbase.cpp"/>
+ RelativePath="..\..\src\common\stdpbase.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\stopwatch.cpp"/>
+ RelativePath="..\..\src\common\stopwatch.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\strconv.cpp"/>
+ RelativePath="..\..\src\common\strconv.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\stream.cpp"/>
+ RelativePath="..\..\src\common\stream.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\string.cpp"/>
+ RelativePath="..\..\src\common\string.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\stringimpl.cpp"/>
+ RelativePath="..\..\src\common\stringimpl.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\stringops.cpp"/>
+ RelativePath="..\..\src\common\stringops.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\strvararg.cpp"/>
+ RelativePath="..\..\src\common\strvararg.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\sysopt.cpp"/>
+ RelativePath="..\..\src\common\sysopt.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\tarstrm.cpp"/>
+ RelativePath="..\..\src\common\tarstrm.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\textbuf.cpp"/>
+ RelativePath="..\..\src\common\textbuf.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\textfile.cpp"/>
+ RelativePath="..\..\src\common\textfile.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\timercmn.cpp"/>
+ RelativePath="..\..\src\common\timercmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\timerimpl.cpp"/>
+ RelativePath="..\..\src\common\timerimpl.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\tokenzr.cpp"/>
+ RelativePath="..\..\src\common\tokenzr.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\txtstrm.cpp"/>
+ RelativePath="..\..\src\common\txtstrm.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\unichar.cpp"/>
+ RelativePath="..\..\src\common\unichar.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\uri.cpp"/>
+ RelativePath="..\..\src\common\uri.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\ustring.cpp"/>
+ RelativePath="..\..\src\common\ustring.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\utilscmn.cpp"/>
+ RelativePath="..\..\src\common\utilscmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\variant.cpp"/>
+ RelativePath="..\..\src\common\variant.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\wfstream.cpp"/>
+ RelativePath="..\..\src\common\wfstream.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\wxcrt.cpp"/>
+ RelativePath="..\..\src\common\wxcrt.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\wxprintf.cpp"/>
+ RelativePath="..\..\src\common\wxprintf.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\xlocale.cpp"/>
+ RelativePath="..\..\src\common\xlocale.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\xti.cpp"/>
+ RelativePath="..\..\src\common\xti.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\xtistrm.cpp"/>
+ RelativePath="..\..\src\common\xtistrm.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\zipstrm.cpp"/>
+ RelativePath="..\..\src\common\zipstrm.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\zstream.cpp"/>
+ RelativePath="..\..\src\common\zstream.cpp">
+ </File>
</Filter>
<Filter
Name="MSW Sources"
UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}">
<File
- RelativePath="..\..\src\msw\basemsw.cpp"/>
+ RelativePath="..\..\src\msw\basemsw.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\crashrpt.cpp"/>
+ RelativePath="..\..\src\msw\crashrpt.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\dde.cpp"/>
+ RelativePath="..\..\src\msw\dde.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\debughlp.cpp"/>
+ RelativePath="..\..\src\msw\debughlp.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\dir.cpp"/>
+ RelativePath="..\..\src\msw\dir.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\dlmsw.cpp"/>
+ RelativePath="..\..\src\msw\dlmsw.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\evtloop.cpp"/>
+ RelativePath="..\..\src\msw\evtloop.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\main.cpp"/>
+ RelativePath="..\..\src\msw\main.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\mimetype.cpp"/>
+ RelativePath="..\..\src\msw\mimetype.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\mslu.cpp"/>
+ RelativePath="..\..\src\msw\mslu.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\power.cpp"/>
+ RelativePath="..\..\src\msw\power.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\regconf.cpp"/>
+ RelativePath="..\..\src\msw\regconf.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\registry.cpp"/>
+ RelativePath="..\..\src\msw\registry.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\snglinst.cpp"/>
+ RelativePath="..\..\src\msw\snglinst.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\stackwalk.cpp"/>
+ RelativePath="..\..\src\msw\stackwalk.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\stdpaths.cpp"/>
+ RelativePath="..\..\src\msw\stdpaths.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\thread.cpp"/>
+ RelativePath="..\..\src\msw\thread.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\timer.cpp"/>
+ RelativePath="..\..\src\msw\timer.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\utils.cpp"/>
+ RelativePath="..\..\src\msw\utils.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\utilsexc.cpp"/>
+ RelativePath="..\..\src\msw\utilsexc.cpp">
+ </File>
<File
RelativePath="..\..\src\msw\version.rc">
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
- RelativePath="..\..\src\msw\volume.cpp"/>
+ RelativePath="..\..\src\msw\volume.cpp">
+ </File>
</Filter>
<Filter
Name="Setup Headers"
@@ -1010,19 +1043,26 @@
Name="MSW Headers"
UniqueIdentifier="{5AFFF20E-29F9-512B-B80A-7DC45976CDAC}">
<File
- RelativePath="..\..\include\wx\msw\apptbase.h"/>
+ RelativePath="..\..\include\wx\msw\apptbase.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\apptrait.h"/>
+ RelativePath="..\..\include\wx\msw\apptrait.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\chkconf.h"/>
+ RelativePath="..\..\include\wx\msw\chkconf.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\crashrpt.h"/>
+ RelativePath="..\..\include\wx\msw\crashrpt.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\dde.h"/>
+ RelativePath="..\..\include\wx\msw\dde.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\debughlp.h"/>
+ RelativePath="..\..\include\wx\msw\debughlp.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\gccpriv.h"/>
+ RelativePath="..\..\include\wx\msw\gccpriv.h">
+ </File>
<File
RelativePath="..\..\include\wx\msw\genrcdefs.h">
<FileConfiguration
@@ -1099,299 +1139,448 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\include\wx\msw\libraries.h"/>
+ RelativePath="..\..\include\wx\msw\libraries.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\mimetype.h"/>
+ RelativePath="..\..\include\wx\msw\mimetype.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\mslu.h"/>
+ RelativePath="..\..\include\wx\msw\mslu.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\private.h"/>
+ RelativePath="..\..\include\wx\msw\private.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\regconf.h"/>
+ RelativePath="..\..\include\wx\msw\regconf.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\registry.h"/>
+ RelativePath="..\..\include\wx\msw\registry.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\seh.h"/>
+ RelativePath="..\..\include\wx\msw\seh.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\stackwalk.h"/>
+ RelativePath="..\..\include\wx\msw\stackwalk.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\stdpaths.h"/>
+ RelativePath="..\..\include\wx\msw\stdpaths.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\winundef.h"/>
+ RelativePath="..\..\include\wx\msw\winundef.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\wrapcctl.h"/>
+ RelativePath="..\..\include\wx\msw\wrapcctl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\wrapcdlg.h"/>
+ RelativePath="..\..\include\wx\msw\wrapcdlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\wrapwin.h"/>
+ RelativePath="..\..\include\wx\msw\wrapwin.h">
+ </File>
</Filter>
<Filter
Name="wxHTML Headers"
UniqueIdentifier="{B4103426-A5DB-5CF0-A30E-BC9546513AAF}">
<File
- RelativePath="..\..\include\wx\html\forcelnk.h"/>
+ RelativePath="..\..\include\wx\html\forcelnk.h">
+ </File>
</Filter>
<Filter
Name="Common Headers"
UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}">
<File
- RelativePath="..\..\include\wx\afterstd.h"/>
+ RelativePath="..\..\include\wx\afterstd.h">
+ </File>
+ <File
+ RelativePath="..\..\include\wx\app.h">
+ </File>
+ <File
+ RelativePath="..\..\include\wx\apptrait.h">
+ </File>
<File
- RelativePath="..\..\include\wx\app.h"/>
+ RelativePath="..\..\include\wx\archive.h">
+ </File>
<File
- RelativePath="..\..\include\wx\apptrait.h"/>
+ RelativePath="..\..\include\wx\arrstr.h">
+ </File>
<File
- RelativePath="..\..\include\wx\archive.h"/>
+ RelativePath="..\..\include\wx\atomic.h">
+ </File>
<File
- RelativePath="..\..\include\wx\arrstr.h"/>
+ RelativePath="..\..\include\wx\base64.h">
+ </File>
<File
- RelativePath="..\..\include\wx\atomic.h"/>
+ RelativePath="..\..\include\wx\beforestd.h">
+ </File>
<File
- RelativePath="..\..\include\wx\base64.h"/>
+ RelativePath="..\..\include\wx\buffer.h">
+ </File>
<File
- RelativePath="..\..\include\wx\beforestd.h"/>
+ RelativePath="..\..\include\wx\build.h">
+ </File>
<File
- RelativePath="..\..\include\wx\buffer.h"/>
+ RelativePath="..\..\include\wx\chartype.h">
+ </File>
<File
- RelativePath="..\..\include\wx\build.h"/>
+ RelativePath="..\..\include\wx\chkconf.h">
+ </File>
<File
- RelativePath="..\..\include\wx\chartype.h"/>
+ RelativePath="..\..\include\wx\clntdata.h">
+ </File>
<File
- RelativePath="..\..\include\wx\chkconf.h"/>
+ RelativePath="..\..\include\wx\cmdargs.h">
+ </File>
<File
- RelativePath="..\..\include\wx\clntdata.h"/>
+ RelativePath="..\..\include\wx\cmdline.h">
+ </File>
<File
- RelativePath="..\..\include\wx\cmdargs.h"/>
+ RelativePath="..\..\include\wx\confbase.h">
+ </File>
<File
- RelativePath="..\..\include\wx\cmdline.h"/>
+ RelativePath="..\..\include\wx\config.h">
+ </File>
<File
- RelativePath="..\..\include\wx\confbase.h"/>
+ RelativePath="..\..\include\wx\containr.h">
+ </File>
<File
- RelativePath="..\..\include\wx\config.h"/>
+ RelativePath="..\..\include\wx\convauto.h">
+ </File>
<File
- RelativePath="..\..\include\wx\containr.h"/>
+ RelativePath="..\..\include\wx\meta\convertible.h">
+ </File>
<File
- RelativePath="..\..\include\wx\convauto.h"/>
+ RelativePath="..\..\include\wx\cpp.h">
+ </File>
<File
- RelativePath="..\..\include\wx\meta\convertible.h"/>
+ RelativePath="..\..\include\wx\crt.h">
+ </File>
<File
- RelativePath="..\..\include\wx\cpp.h"/>
+ RelativePath="..\..\include\wx\datetime.h">
+ </File>
<File
- RelativePath="..\..\include\wx\crt.h"/>
+ RelativePath="..\..\include\wx\datstrm.h">
+ </File>
<File
- RelativePath="..\..\include\wx\datetime.h"/>
+ RelativePath="..\..\include\wx\dde.h">
+ </File>
<File
- RelativePath="..\..\include\wx\datstrm.h"/>
+ RelativePath="..\..\include\wx\debug.h">
+ </File>
<File
- RelativePath="..\..\include\wx\dde.h"/>
+ RelativePath="..\..\include\wx\defs.h">
+ </File>
<File
- RelativePath="..\..\include\wx\debug.h"/>
+ RelativePath="..\..\include\wx\dir.h">
+ </File>
<File
- RelativePath="..\..\include\wx\defs.h"/>
+ RelativePath="..\..\include\wx\dlimpexp.h">
+ </File>
<File
- RelativePath="..\..\include\wx\dir.h"/>
+ RelativePath="..\..\include\wx\dlist.h">
+ </File>
<File
- RelativePath="..\..\include\wx\dlimpexp.h"/>
+ RelativePath="..\..\include\wx\dynarray.h">
+ </File>
<File
- RelativePath="..\..\include\wx\dlist.h"/>
+ RelativePath="..\..\include\wx\dynlib.h">
+ </File>
<File
- RelativePath="..\..\include\wx\dynarray.h"/>
+ RelativePath="..\..\include\wx\dynload.h">
+ </File>
<File
- RelativePath="..\..\include\wx\dynlib.h"/>
+ RelativePath="..\..\include\wx\encconv.h">
+ </File>
<File
- RelativePath="..\..\include\wx\dynload.h"/>
+ RelativePath="..\..\include\wx\event.h">
+ </File>
<File
- RelativePath="..\..\include\wx\encconv.h"/>
+ RelativePath="..\..\include\wx\except.h">
+ </File>
<File
- RelativePath="..\..\include\wx\event.h"/>
+ RelativePath="..\..\include\wx\features.h">
+ </File>
<File
- RelativePath="..\..\include\wx\except.h"/>
+ RelativePath="..\..\include\wx\ffile.h">
+ </File>
<File
- RelativePath="..\..\include\wx\features.h"/>
+ RelativePath="..\..\include\wx\file.h">
+ </File>
<File
- RelativePath="..\..\include\wx\ffile.h"/>
+ RelativePath="..\..\include\wx\fileconf.h">
+ </File>
<File
- RelativePath="..\..\include\wx\file.h"/>
+ RelativePath="..\..\include\wx\filefn.h">
+ </File>
<File
- RelativePath="..\..\include\wx\fileconf.h"/>
+ RelativePath="..\..\include\wx\filename.h">
+ </File>
<File
- RelativePath="..\..\include\wx\filefn.h"/>
+ RelativePath="..\..\include\wx\filesys.h">
+ </File>
<File
- RelativePath="..\..\include\wx\filename.h"/>
+ RelativePath="..\..\include\wx\flags.h">
+ </File>
<File
- RelativePath="..\..\include\wx\filesys.h"/>
+ RelativePath="..\..\include\wx\fontenc.h">
+ </File>
<File
- RelativePath="..\..\include\wx\flags.h"/>
+ RelativePath="..\..\include\wx\fontmap.h">
+ </File>
<File
- RelativePath="..\..\include\wx\fontenc.h"/>
+ RelativePath="..\..\include\wx\fs_arc.h">
+ </File>
<File
- RelativePath="..\..\include\wx\fontmap.h"/>
+ RelativePath="..\..\include\wx\fs_filter.h">
+ </File>
<File
- RelativePath="..\..\include\wx\fs_arc.h"/>
+ RelativePath="..\..\include\wx\fs_mem.h">
+ </File>
<File
- RelativePath="..\..\include\wx\fs_filter.h"/>
+ RelativePath="..\..\include\wx\fs_zip.h">
+ </File>
<File
- RelativePath="..\..\include\wx\fs_mem.h"/>
+ RelativePath="..\..\include\wx\hash.h">
+ </File>
<File
- RelativePath="..\..\include\wx\fs_zip.h"/>
+ RelativePath="..\..\include\wx\hashmap.h">
+ </File>
<File
- RelativePath="..\..\include\wx\hash.h"/>
+ RelativePath="..\..\include\wx\hashset.h">
+ </File>
<File
- RelativePath="..\..\include\wx\hashmap.h"/>
+ RelativePath="..\..\include\wx\iconloc.h">
+ </File>
<File
- RelativePath="..\..\include\wx\hashset.h"/>
+ RelativePath="..\..\include\wx\meta\if.h">
+ </File>
<File
- RelativePath="..\..\include\wx\iconloc.h"/>
+ RelativePath="..\..\include\wx\init.h">
+ </File>
<File
- RelativePath="..\..\include\wx\meta\if.h"/>
+ RelativePath="..\..\include\wx\meta\int2type.h">
+ </File>
<File
- RelativePath="..\..\include\wx\init.h"/>
+ RelativePath="..\..\include\wx\intl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\meta\int2type.h"/>
+ RelativePath="..\..\include\wx\iosfwrap.h">
+ </File>
<File
- RelativePath="..\..\include\wx\intl.h"/>
+ RelativePath="..\..\include\wx\ioswrap.h">
+ </File>
<File
- RelativePath="..\..\include\wx\iosfwrap.h"/>
+ RelativePath="..\..\include\wx\ipc.h">
+ </File>
<File
- RelativePath="..\..\include\wx\ioswrap.h"/>
+ RelativePath="..\..\include\wx\ipcbase.h">
+ </File>
<File
- RelativePath="..\..\include\wx\ipc.h"/>
+ RelativePath="..\..\include\wx\kbdstate.h">
+ </File>
<File
- RelativePath="..\..\include\wx\ipcbase.h"/>
+ RelativePath="..\..\include\wx\link.h">
+ </File>
<File
- RelativePath="..\..\include\wx\link.h"/>
+ RelativePath="..\..\include\wx\list.h">
+ </File>
<File
- RelativePath="..\..\include\wx\list.h"/>
+ RelativePath="..\..\include\wx\log.h">
+ </File>
<File
- RelativePath="..\..\include\wx\log.h"/>
+ RelativePath="..\..\include\wx\longlong.h">
+ </File>
<File
- RelativePath="..\..\include\wx\longlong.h"/>
+ RelativePath="..\..\include\wx\math.h">
+ </File>
<File
- RelativePath="..\..\include\wx\math.h"/>
+ RelativePath="..\..\include\wx\memconf.h">
+ </File>
<File
- RelativePath="..\..\include\wx\memconf.h"/>
+ RelativePath="..\..\include\wx\memory.h">
+ </File>
<File
- RelativePath="..\..\include\wx\memory.h"/>
+ RelativePath="..\..\include\wx\memtext.h">
+ </File>
<File
- RelativePath="..\..\include\wx\memtext.h"/>
+ RelativePath="..\..\include\wx\mimetype.h">
+ </File>
<File
- RelativePath="..\..\include\wx\mimetype.h"/>
+ RelativePath="..\..\include\wx\module.h">
+ </File>
<File
- RelativePath="..\..\include\wx\module.h"/>
+ RelativePath="..\..\include\wx\mousestate.h">
+ </File>
<File
- RelativePath="..\..\include\wx\meta\movable.h"/>
+ RelativePath="..\..\include\wx\meta\movable.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msgout.h"/>
+ RelativePath="..\..\include\wx\msgout.h">
+ </File>
<File
- RelativePath="..\..\include\wx\mstream.h"/>
+ RelativePath="..\..\include\wx\mstream.h">
+ </File>
<File
- RelativePath="..\..\include\wx\object.h"/>
+ RelativePath="..\..\include\wx\object.h">
+ </File>
<File
- RelativePath="..\..\include\wx\platform.h"/>
+ RelativePath="..\..\include\wx\platform.h">
+ </File>
<File
- RelativePath="..\..\include\wx\platinfo.h"/>
+ RelativePath="..\..\include\wx\platinfo.h">
+ </File>
<File
- RelativePath="..\..\include\wx\power.h"/>
+ RelativePath="..\..\include\wx\power.h">
+ </File>
<File
- RelativePath="..\..\include\wx\process.h"/>
+ RelativePath="..\..\include\wx\process.h">
+ </File>
<File
- RelativePath="..\..\include\wx\ptr_scpd.h"/>
+ RelativePath="..\..\include\wx\ptr_scpd.h">
+ </File>
<File
- RelativePath="..\..\include\wx\ptr_shrd.h"/>
+ RelativePath="..\..\include\wx\ptr_shrd.h">
+ </File>
<File
- RelativePath="..\..\include\wx\recguard.h"/>
+ RelativePath="..\..\include\wx\recguard.h">
+ </File>
<File
- RelativePath="..\..\include\wx\regex.h"/>
+ RelativePath="..\..\include\wx\regex.h">
+ </File>
<File
- RelativePath="..\..\include\wx\scopeguard.h"/>
+ RelativePath="..\..\include\wx\scopeguard.h">
+ </File>
<File
- RelativePath="..\..\include\wx\snglinst.h"/>
+ RelativePath="..\..\include\wx\snglinst.h">
+ </File>
<File
- RelativePath="..\..\include\wx\sstream.h"/>
+ RelativePath="..\..\include\wx\sstream.h">
+ </File>
<File
- RelativePath="..\..\include\wx\stack.h"/>
+ RelativePath="..\..\include\wx\stack.h">
+ </File>
<File
- RelativePath="..\..\include\wx\stackwalk.h"/>
+ RelativePath="..\..\include\wx\stackwalk.h">
+ </File>
<File
- RelativePath="..\..\include\wx\stdpaths.h"/>
+ RelativePath="..\..\include\wx\stdpaths.h">
+ </File>
<File
- RelativePath="..\..\include\wx\stockitem.h"/>
+ RelativePath="..\..\include\wx\stockitem.h">
+ </File>
<File
- RelativePath="..\..\include\wx\stopwatch.h"/>
+ RelativePath="..\..\include\wx\stopwatch.h">
+ </File>
<File
- RelativePath="..\..\include\wx\strconv.h"/>
+ RelativePath="..\..\include\wx\strconv.h">
+ </File>
<File
- RelativePath="..\..\include\wx\stream.h"/>
+ RelativePath="..\..\include\wx\stream.h">
+ </File>
<File
- RelativePath="..\..\include\wx\string.h"/>
+ RelativePath="..\..\include\wx\string.h">
+ </File>
<File
- RelativePath="..\..\include\wx\stringimpl.h"/>
+ RelativePath="..\..\include\wx\stringimpl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\stringops.h"/>
+ RelativePath="..\..\include\wx\stringops.h">
+ </File>
<File
- RelativePath="..\..\include\wx\strvararg.h"/>
+ RelativePath="..\..\include\wx\strvararg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\sysopt.h"/>
+ RelativePath="..\..\include\wx\sysopt.h">
+ </File>
<File
- RelativePath="..\..\include\wx\tarstrm.h"/>
+ RelativePath="..\..\include\wx\tarstrm.h">
+ </File>
<File
- RelativePath="..\..\include\wx\textbuf.h"/>
+ RelativePath="..\..\include\wx\textbuf.h">
+ </File>
<File
- RelativePath="..\..\include\wx\textfile.h"/>
+ RelativePath="..\..\include\wx\textfile.h">
+ </File>
<File
- RelativePath="..\..\include\wx\thread.h"/>
+ RelativePath="..\..\include\wx\thread.h">
+ </File>
<File
- RelativePath="..\..\include\wx\timer.h"/>
+ RelativePath="..\..\include\wx\timer.h">
+ </File>
<File
- RelativePath="..\..\include\wx\tokenzr.h"/>
+ RelativePath="..\..\include\wx\tokenzr.h">
+ </File>
<File
- RelativePath="..\..\include\wx\tracker.h"/>
+ RelativePath="..\..\include\wx\tracker.h">
+ </File>
<File
- RelativePath="..\..\include\wx\txtstrm.h"/>
+ RelativePath="..\..\include\wx\txtstrm.h">
+ </File>
<File
- RelativePath="..\..\include\wx\types.h"/>
+ RelativePath="..\..\include\wx\types.h">
+ </File>
<File
- RelativePath="..\..\include\wx\unichar.h"/>
+ RelativePath="..\..\include\wx\unichar.h">
+ </File>
<File
- RelativePath="..\..\include\wx\uri.h"/>
+ RelativePath="..\..\include\wx\uri.h">
+ </File>
<File
- RelativePath="..\..\include\wx\ustring.h"/>
+ RelativePath="..\..\include\wx\ustring.h">
+ </File>
<File
- RelativePath="..\..\include\wx\utils.h"/>
+ RelativePath="..\..\include\wx\utils.h">
+ </File>
<File
- RelativePath="..\..\include\wx\variant.h"/>
+ RelativePath="..\..\include\wx\variant.h">
+ </File>
<File
- RelativePath="..\..\include\wx\vector.h"/>
+ RelativePath="..\..\include\wx\vector.h">
+ </File>
<File
- RelativePath="..\..\include\wx\version.h"/>
+ RelativePath="..\..\include\wx\version.h">
+ </File>
<File
- RelativePath="..\..\include\wx\volume.h"/>
+ RelativePath="..\..\include\wx\volume.h">
+ </File>
<File
- RelativePath="..\..\include\wx\weakref.h"/>
+ RelativePath="..\..\include\wx\weakref.h">
+ </File>
<File
- RelativePath="..\..\include\wx\wfstream.h"/>
+ RelativePath="..\..\include\wx\wfstream.h">
+ </File>
<File
- RelativePath="..\..\include\wx\wx.h"/>
+ RelativePath="..\..\include\wx\wx.h">
+ </File>
<File
- RelativePath="..\..\include\wx\wxchar.h"/>
+ RelativePath="..\..\include\wx\wxchar.h">
+ </File>
<File
- RelativePath="..\..\include\wx\wxcrt.h"/>
+ RelativePath="..\..\include\wx\wxcrt.h">
+ </File>
<File
- RelativePath="..\..\include\wx\wxcrtbase.h"/>
+ RelativePath="..\..\include\wx\wxcrtbase.h">
+ </File>
<File
- RelativePath="..\..\include\wx\wxcrtvararg.h"/>
+ RelativePath="..\..\include\wx\wxcrtvararg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\wxprec.h"/>
+ RelativePath="..\..\include\wx\wxprec.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xlocale.h"/>
+ RelativePath="..\..\include\wx\xlocale.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xti.h"/>
+ RelativePath="..\..\include\wx\xti.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xtistrm.h"/>
+ RelativePath="..\..\include\wx\xtistrm.h">
+ </File>
<File
- RelativePath="..\..\include\wx\zipstrm.h"/>
+ RelativePath="..\..\include\wx\zipstrm.h">
+ </File>
<File
- RelativePath="..\..\include\wx\zstream.h"/>
+ RelativePath="..\..\include\wx\zstream.h">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index 36e26c8911..8adfa82f06 100644
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,32 +22,16 @@
IntermediateDirectory="vc_mswunivudll\core"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivudll\wxprec_coredll.pch"
@@ -55,40 +39,46 @@
ObjectFile="vc_mswunivudll\core\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_core.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_core.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -96,32 +86,19 @@
IntermediateDirectory="vc_mswunivuddll\core"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivuddll\wxprec_coredll.pch"
@@ -129,40 +106,46 @@
ObjectFile="vc_mswunivuddll\core\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_core.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_core.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -170,32 +153,16 @@
IntermediateDirectory="vc_mswudll\core"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch"
@@ -203,40 +170,46 @@
ObjectFile="vc_mswudll\core\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29u_core.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_core.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -244,32 +217,19 @@
IntermediateDirectory="vc_mswuddll\core"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch"
@@ -277,40 +237,46 @@
ObjectFile="vc_mswuddll\core\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_core.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_core.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -318,32 +284,16 @@
IntermediateDirectory="vc_mswunivu\core"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivu\wxprec_corelib.pch"
@@ -351,32 +301,38 @@
ObjectFile="vc_mswunivu\core\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_core.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmswuniv29u_core.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmswuniv29u_core.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_core.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -384,32 +340,19 @@
IntermediateDirectory="vc_mswunivud\core"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivud\wxprec_corelib.pch"
@@ -417,32 +360,38 @@
ObjectFile="vc_mswunivud\core\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_core.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_core.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_core.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_core.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -450,32 +399,16 @@
IntermediateDirectory="vc_mswu\core"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswu\wxprec_corelib.pch"
@@ -483,32 +416,38 @@
ObjectFile="vc_mswu\core\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_core.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmsw29u_core.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmsw29u_core.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_core.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -516,32 +455,19 @@
IntermediateDirectory="vc_mswud\core"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswud\wxprec_corelib.pch"
@@ -549,32 +475,38 @@
ObjectFile="vc_mswud\core\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_core.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmsw29ud_core.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmsw29ud_core.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_core.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -585,71 +517,104 @@
Name="Common Sources"
UniqueIdentifier="{A6A5C30D-BDB6-5050-906D-10A96065136C}">
<File
- RelativePath="..\..\src\common\accelcmn.cpp"/>
+ RelativePath="..\..\src\common\accelcmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\accesscmn.cpp"/>
+ RelativePath="..\..\src\common\accesscmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\anidecod.cpp"/>
+ RelativePath="..\..\src\common\anidecod.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\appcmn.cpp"/>
+ RelativePath="..\..\src\common\appcmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\artprov.cpp"/>
+ RelativePath="..\..\src\common\artprov.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\artstd.cpp"/>
+ RelativePath="..\..\src\common\artstd.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\bmpbase.cpp"/>
+ RelativePath="..\..\src\common\bmpbase.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\bookctrl.cpp"/>
+ RelativePath="..\..\src\common\bookctrl.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\btncmn.cpp"/>
+ RelativePath="..\..\src\common\btncmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\cairo.cpp"/>
+ RelativePath="..\..\src\common\cairo.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\choiccmn.cpp"/>
+ RelativePath="..\..\src\common\choiccmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\clipcmn.cpp"/>
+ RelativePath="..\..\src\common\clipcmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\clrpickercmn.cpp"/>
+ RelativePath="..\..\src\common\clrpickercmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\cmdproc.cpp"/>
+ RelativePath="..\..\src\common\cmdproc.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\cmndata.cpp"/>
+ RelativePath="..\..\src\common\cmndata.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\colourcmn.cpp"/>
+ RelativePath="..\..\src\common\colourcmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\combocmn.cpp"/>
+ RelativePath="..\..\src\common\combocmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\containr.cpp"/>
+ RelativePath="..\..\src\common\containr.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\cshelp.cpp"/>
+ RelativePath="..\..\src\common\cshelp.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\ctrlcmn.cpp"/>
+ RelativePath="..\..\src\common\ctrlcmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\ctrlsub.cpp"/>
+ RelativePath="..\..\src\common\ctrlsub.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\datacmn.cpp"/>
+ RelativePath="..\..\src\common\datacmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\dcbase.cpp"/>
+ RelativePath="..\..\src\common\dcbase.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\dcbufcmn.cpp"/>
+ RelativePath="..\..\src\common\dcbufcmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\dcgraph.cpp"/>
+ RelativePath="..\..\src\common\dcgraph.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\dcsvg.cpp"/>
+ RelativePath="..\..\src\common\dcsvg.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\dlgcmn.cpp"/>
+ RelativePath="..\..\src\common\dlgcmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\dndcmn.cpp"/>
+ RelativePath="..\..\src\common\dndcmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\dobjcmn.cpp"/>
+ RelativePath="..\..\src\common\dobjcmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\docmdi.cpp"/>
+ RelativePath="..\..\src\common\docmdi.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\docview.cpp"/>
+ RelativePath="..\..\src\common\docview.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\dpycmn.cpp"/>
+ RelativePath="..\..\src\common\dpycmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\dseldlg.cpp"/>
+ RelativePath="..\..\src\common\dseldlg.cpp">
+ </File>
<File
RelativePath="..\..\src\common\dummy.cpp">
<FileConfiguration
@@ -702,143 +667,212 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\common\effects.cpp"/>
+ RelativePath="..\..\src\common\effects.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\event.cpp"/>
+ RelativePath="..\..\src\common\event.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\fddlgcmn.cpp"/>
+ RelativePath="..\..\src\common\fddlgcmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\filectrlcmn.cpp"/>
+ RelativePath="..\..\src\common\filectrlcmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\filepickercmn.cpp"/>
+ RelativePath="..\..\src\common\filepickercmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\fldlgcmn.cpp"/>
+ RelativePath="..\..\src\common\fldlgcmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\fontcmn.cpp"/>
+ RelativePath="..\..\src\common\fontcmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\fontenumcmn.cpp"/>
+ RelativePath="..\..\src\common\fontenumcmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\fontmap.cpp"/>
+ RelativePath="..\..\src\common\fontmap.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\fontpickercmn.cpp"/>
+ RelativePath="..\..\src\common\fontpickercmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\fontutilcmn.cpp"/>
+ RelativePath="..\..\src\common\fontutilcmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\framecmn.cpp"/>
+ RelativePath="..\..\src\common\framecmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\fs_mem.cpp"/>
+ RelativePath="..\..\src\common\fs_mem.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\gaugecmn.cpp"/>
+ RelativePath="..\..\src\common\gaugecmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\gbsizer.cpp"/>
+ RelativePath="..\..\src\common\gbsizer.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\gdicmn.cpp"/>
+ RelativePath="..\..\src\common\gdicmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\geometry.cpp"/>
+ RelativePath="..\..\src\common\geometry.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\gifdecod.cpp"/>
+ RelativePath="..\..\src\common\gifdecod.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\graphcmn.cpp"/>
+ RelativePath="..\..\src\common\graphcmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\helpbase.cpp"/>
+ RelativePath="..\..\src\common\helpbase.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\iconbndl.cpp"/>
+ RelativePath="..\..\src\common\iconbndl.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\imagall.cpp"/>
+ RelativePath="..\..\src\common\imagall.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\imagbmp.cpp"/>
+ RelativePath="..\..\src\common\imagbmp.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\image.cpp"/>
+ RelativePath="..\..\src\common\image.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\imagfill.cpp"/>
+ RelativePath="..\..\src\common\imagfill.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\imaggif.cpp"/>
+ RelativePath="..\..\src\common\imaggif.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\imagiff.cpp"/>
+ RelativePath="..\..\src\common\imagiff.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\imagjpeg.cpp"/>
+ RelativePath="..\..\src\common\imagjpeg.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\imagpcx.cpp"/>
+ RelativePath="..\..\src\common\imagpcx.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\imagpng.cpp"/>
+ RelativePath="..\..\src\common\imagpng.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\imagpnm.cpp"/>
+ RelativePath="..\..\src\common\imagpnm.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\imagtga.cpp"/>
+ RelativePath="..\..\src\common\imagtga.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\imagtiff.cpp"/>
+ RelativePath="..\..\src\common\imagtiff.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\imagxpm.cpp"/>
+ RelativePath="..\..\src\common\imagxpm.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\layout.cpp"/>
+ RelativePath="..\..\src\common\layout.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\lboxcmn.cpp"/>
+ RelativePath="..\..\src\common\lboxcmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\listctrlcmn.cpp"/>
+ RelativePath="..\..\src\common\listctrlcmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\matrix.cpp"/>
+ RelativePath="..\..\src\common\matrix.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\menucmn.cpp"/>
+ RelativePath="..\..\src\common\menucmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\msgout.cpp"/>
+ RelativePath="..\..\src\common\msgout.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\nbkbase.cpp"/>
+ RelativePath="..\..\src\common\nbkbase.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\overlaycmn.cpp"/>
+ RelativePath="..\..\src\common\overlaycmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\paper.cpp"/>
+ RelativePath="..\..\src\common\paper.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\pickerbase.cpp"/>
+ RelativePath="..\..\src\common\pickerbase.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\popupcmn.cpp"/>
+ RelativePath="..\..\src\common\popupcmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\prntbase.cpp"/>
+ RelativePath="..\..\src\common\prntbase.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\quantize.cpp"/>
+ RelativePath="..\..\src\common\quantize.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\radiocmn.cpp"/>
+ RelativePath="..\..\src\common\radiocmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\rendcmn.cpp"/>
+ RelativePath="..\..\src\common\rendcmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\rgncmn.cpp"/>
+ RelativePath="..\..\src\common\rgncmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\settcmn.cpp"/>
+ RelativePath="..\..\src\common\settcmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\sizer.cpp"/>
+ RelativePath="..\..\src\common\sizer.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\srchcmn.cpp"/>
+ RelativePath="..\..\src\common\srchcmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\statbar.cpp"/>
+ RelativePath="..\..\src\common\statbar.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\stattextcmn.cpp"/>
+ RelativePath="..\..\src\common\stattextcmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\stockitem.cpp"/>
+ RelativePath="..\..\src\common\stockitem.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\tbarbase.cpp"/>
+ RelativePath="..\..\src\common\tbarbase.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\textcmn.cpp"/>
+ RelativePath="..\..\src\common\textcmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\textentrycmn.cpp"/>
+ RelativePath="..\..\src\common\textentrycmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\toplvcmn.cpp"/>
+ RelativePath="..\..\src\common\toplvcmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\treebase.cpp"/>
+ RelativePath="..\..\src\common\treebase.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\utilscmn.cpp"/>
+ RelativePath="..\..\src\common\utilscmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\valgen.cpp"/>
+ RelativePath="..\..\src\common\valgen.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\validate.cpp"/>
+ RelativePath="..\..\src\common\validate.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\valtext.cpp"/>
+ RelativePath="..\..\src\common\valtext.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\wincmn.cpp"/>
+ RelativePath="..\..\src\common\wincmn.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\windowid.cpp"/>
+ RelativePath="..\..\src\common\windowid.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\wrapsizer.cpp"/>
+ RelativePath="..\..\src\common\wrapsizer.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\xpmdecod.cpp"/>
+ RelativePath="..\..\src\common\xpmdecod.cpp">
+ </File>
</Filter>
<Filter
Name="MSW Sources"
@@ -847,841 +881,893 @@
RelativePath="..\..\src\msw\accel.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\msw\ole\access.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
- RelativePath="..\..\src\msw\app.cpp"/>
+ RelativePath="..\..\src\msw\app.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\ole\automtn.cpp"/>
+ RelativePath="..\..\src\msw\ole\automtn.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\bitmap.cpp"/>
+ RelativePath="..\..\src\msw\bitmap.cpp">
+ </File>
<File
RelativePath="..\..\src\msw\bmpbuttn.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
- RelativePath="..\..\src\msw\brush.cpp"/>
+ RelativePath="..\..\src\msw\brush.cpp">
+ </File>
<File
RelativePath="..\..\src\msw\button.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
- RelativePath="..\..\src\msw\caret.cpp"/>
+ RelativePath="..\..\src\msw\caret.cpp">
+ </File>
<File
RelativePath="..\..\src\msw\checkbox.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\msw\checklst.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\msw\choice.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
- RelativePath="..\..\src\msw\clipbrd.cpp"/>
+ RelativePath="..\..\src\msw\clipbrd.cpp">
+ </File>
<File
RelativePath="..\..\src\msw\colordlg.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
- RelativePath="..\..\src\msw\colour.cpp"/>
+ RelativePath="..\..\src\msw\colour.cpp">
+ </File>
<File
RelativePath="..\..\src\msw\combo.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\msw\combobox.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\msw\control.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
- RelativePath="..\..\src\msw\cursor.cpp"/>
+ RelativePath="..\..\src\msw\cursor.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\data.cpp"/>
+ RelativePath="..\..\src\msw\data.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\ole\dataobj.cpp"/>
+ RelativePath="..\..\src\msw\ole\dataobj.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\dc.cpp"/>
+ RelativePath="..\..\src\msw\dc.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\dcclient.cpp"/>
+ RelativePath="..\..\src\msw\dcclient.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\dcmemory.cpp"/>
+ RelativePath="..\..\src\msw\dcmemory.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\dcprint.cpp"/>
+ RelativePath="..\..\src\msw\dcprint.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\dcscreen.cpp"/>
+ RelativePath="..\..\src\msw\dcscreen.cpp">
+ </File>
<File
RelativePath="..\..\src\msw\dialog.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
- RelativePath="..\..\src\msw\dialup.cpp"/>
+ RelativePath="..\..\src\msw\dialup.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\dib.cpp"/>
+ RelativePath="..\..\src\msw\dib.cpp">
+ </File>
<File
RelativePath="..\..\src\msw\dirdlg.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
- RelativePath="..\..\src\msw\display.cpp"/>
+ RelativePath="..\..\src\msw\display.cpp">
+ </File>
<File
RelativePath="..\..\src\msw\dragimag.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
- RelativePath="..\..\src\msw\ole\dropsrc.cpp"/>
+ RelativePath="..\..\src\msw\ole\dropsrc.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\ole\droptgt.cpp"/>
+ RelativePath="..\..\src\msw\ole\droptgt.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\enhmeta.cpp"/>
+ RelativePath="..\..\src\msw\enhmeta.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\evtloop.cpp"/>
+ RelativePath="..\..\src\msw\evtloop.cpp">
+ </File>
<File
RelativePath="..\..\src\msw\fdrepdlg.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\msw\filedlg.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
- RelativePath="..\..\src\msw\font.cpp"/>
+ RelativePath="..\..\src\msw\font.cpp">
+ </File>
<File
RelativePath="..\..\src\msw\fontdlg.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
- RelativePath="..\..\src\msw\fontenum.cpp"/>
+ RelativePath="..\..\src\msw\fontenum.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\fontutil.cpp"/>
+ RelativePath="..\..\src\msw\fontutil.cpp">
+ </File>
<File
RelativePath="..\..\src\msw\frame.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\msw\gauge.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
- RelativePath="..\..\src\msw\gdiimage.cpp"/>
+ RelativePath="..\..\src\msw\gdiimage.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\gdiobj.cpp"/>
+ RelativePath="..\..\src\msw\gdiobj.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\gdiplus.cpp"/>
+ RelativePath="..\..\src\msw\gdiplus.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\graphics.cpp"/>
+ RelativePath="..\..\src\msw\graphics.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\helpchm.cpp"/>
+ RelativePath="..\..\src\msw\helpchm.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\helpwin.cpp"/>
+ RelativePath="..\..\src\msw\helpwin.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\icon.cpp"/>
+ RelativePath="..\..\src\msw\icon.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\imaglist.cpp"/>
+ RelativePath="..\..\src\msw\imaglist.cpp">
+ </File>
<File
RelativePath="..\..\src\msw\iniconf.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\msw\listbox.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\msw\listctrl.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
- RelativePath="..\..\src\msw\main.cpp"/>
+ RelativePath="..\..\src\msw\main.cpp">
+ </File>
<File
RelativePath="..\..\src\msw\mdi.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\msw\menu.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\msw\menuitem.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\msw\metafile.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
- RelativePath="..\..\src\msw\minifram.cpp"/>
+ RelativePath="..\..\src\msw\minifram.cpp">
+ </File>
<File
RelativePath="..\..\src\msw\msgdlg.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
- RelativePath="..\..\src\msw\mslu.cpp"/>
+ RelativePath="..\..\src\msw\mslu.cpp">
+ </File>
<File
RelativePath="..\..\src\msw\nativdlg.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\msw\nativewin.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\msw\notebook.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
- RelativePath="..\..\src\msw\ole\oleutils.cpp"/>
+ RelativePath="..\..\src\msw\ole\oleutils.cpp">
+ </File>
<File
RelativePath="..\..\src\msw\ownerdrw.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
- RelativePath="..\..\src\msw\palette.cpp"/>
+ RelativePath="..\..\src\msw\palette.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\pen.cpp"/>
+ RelativePath="..\..\src\msw\pen.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\popupwin.cpp"/>
+ RelativePath="..\..\src\msw\popupwin.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\printdlg.cpp"/>
+ RelativePath="..\..\src\msw\printdlg.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\printwin.cpp"/>
+ RelativePath="..\..\src\msw\printwin.cpp">
+ </File>
<File
RelativePath="..\..\src\msw\radiobox.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\msw\radiobut.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
- RelativePath="..\..\src\msw\region.cpp"/>
+ RelativePath="..\..\src\msw\region.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\renderer.cpp"/>
+ RelativePath="..\..\src\msw\renderer.cpp">
+ </File>
<File
RelativePath="..\..\src\msw\scrolbar.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
- RelativePath="..\..\src\msw\settings.cpp"/>
+ RelativePath="..\..\src\msw\settings.cpp">
+ </File>
<File
RelativePath="..\..\src\msw\slider.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\msw\spinbutt.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\msw\spinctrl.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\msw\statbmp.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\msw\statbox.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\msw\statline.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\msw\stattext.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\msw\statusbar.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\msw\tabctrl.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\msw\textctrl.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\msw\textentry.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\msw\tglbtn.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\msw\toolbar.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
- RelativePath="..\..\src\msw\tooltip.cpp"/>
+ RelativePath="..\..\src\msw\tooltip.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\toplevel.cpp"/>
+ RelativePath="..\..\src\msw\toplevel.cpp">
+ </File>
<File
RelativePath="..\..\src\msw\treectrl.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
- RelativePath="..\..\src\msw\utilsgui.cpp"/>
+ RelativePath="..\..\src\msw\utilsgui.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\ole\uuid.cpp"/>
+ RelativePath="..\..\src\msw\ole\uuid.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\uxtheme.cpp"/>
+ RelativePath="..\..\src\msw\uxtheme.cpp">
+ </File>
<File
RelativePath="..\..\src\msw\version.rc">
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
- RelativePath="..\..\src\msw\volume.cpp"/>
+ RelativePath="..\..\src\msw\volume.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\window.cpp"/>
+ RelativePath="..\..\src\msw\window.cpp">
+ </File>
</Filter>
<Filter
Name="Generic Sources"
@@ -1690,235 +1776,269 @@
RelativePath="..\..\src\generic\accel.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
- RelativePath="..\..\src\generic\busyinfo.cpp"/>
+ RelativePath="..\..\src\generic\busyinfo.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\buttonbar.cpp"/>
+ RelativePath="..\..\src\generic\buttonbar.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\choicbkg.cpp"/>
+ RelativePath="..\..\src\generic\choicbkg.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\choicdgg.cpp"/>
+ RelativePath="..\..\src\generic\choicdgg.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\clrpickerg.cpp"/>
+ RelativePath="..\..\src\generic\clrpickerg.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\collpaneg.cpp"/>
+ RelativePath="..\..\src\generic\collpaneg.cpp">
+ </File>
<File
RelativePath="..\..\src\generic\colrdlgg.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
- RelativePath="..\..\src\generic\combog.cpp"/>
+ RelativePath="..\..\src\generic\combog.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\dcpsg.cpp"/>
+ RelativePath="..\..\src\generic\dcpsg.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\dirctrlg.cpp"/>
+ RelativePath="..\..\src\generic\dirctrlg.cpp">
+ </File>
<File
RelativePath="..\..\src\generic\dirdlgg.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
- RelativePath="..\..\src\generic\dragimgg.cpp"/>
+ RelativePath="..\..\src\generic\dragimgg.cpp">
+ </File>
<File
RelativePath="..\..\src\generic\fdrepdlg.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
- RelativePath="..\..\src\generic\filectrlg.cpp"/>
+ RelativePath="..\..\src\generic\filectrlg.cpp">
+ </File>
<File
RelativePath="..\..\src\generic\filedlgg.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
- RelativePath="..\..\src\generic\filepickerg.cpp"/>
+ RelativePath="..\..\src\generic\filepickerg.cpp">
+ </File>
<File
RelativePath="..\..\src\generic\fontdlgg.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
- RelativePath="..\..\src\generic\fontpickerg.cpp"/>
+ RelativePath="..\..\src\generic\fontpickerg.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\listbkg.cpp"/>
+ RelativePath="..\..\src\generic\listbkg.cpp">
+ </File>
<File
RelativePath="..\..\src\generic\listctrl.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
- RelativePath="..\..\src\generic\logg.cpp"/>
+ RelativePath="..\..\src\generic\logg.cpp">
+ </File>
<File
RelativePath="..\..\src\generic\mdig.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\generic\msgdlgg.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
- RelativePath="..\..\src\generic\numdlgg.cpp"/>
+ RelativePath="..\..\src\generic\numdlgg.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\panelg.cpp"/>
+ RelativePath="..\..\src\generic\panelg.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\printps.cpp"/>
+ RelativePath="..\..\src\generic\printps.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\prntdlgg.cpp"/>
+ RelativePath="..\..\src\generic\prntdlgg.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\progdlgg.cpp"/>
+ RelativePath="..\..\src\generic\progdlgg.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\renderg.cpp"/>
+ RelativePath="..\..\src\generic\renderg.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\scrlwing.cpp"/>
+ RelativePath="..\..\src\generic\scrlwing.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\selstore.cpp"/>
+ RelativePath="..\..\src\generic\selstore.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\spinctlg.cpp"/>
+ RelativePath="..\..\src\generic\spinctlg.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\splitter.cpp"/>
+ RelativePath="..\..\src\generic\splitter.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\srchctlg.cpp"/>
+ RelativePath="..\..\src\generic\srchctlg.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\statbmpg.cpp"/>
+ RelativePath="..\..\src\generic\statbmpg.cpp">
+ </File>
<File
RelativePath="..\..\src\generic\statusbr.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\generic\tabg.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
- RelativePath="..\..\src\generic\textdlgg.cpp"/>
+ RelativePath="..\..\src\generic\textdlgg.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\tipwin.cpp"/>
+ RelativePath="..\..\src\generic\tipwin.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\toolbkg.cpp"/>
+ RelativePath="..\..\src\generic\toolbkg.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\treebkg.cpp"/>
+ RelativePath="..\..\src\generic\treebkg.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\treectlg.cpp"/>
+ RelativePath="..\..\src\generic\treectlg.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\vlbox.cpp"/>
+ RelativePath="..\..\src\generic\vlbox.cpp">
+ </File>
<File
- RelativePath="..\..\src\generic\vscroll.cpp"/>
+ RelativePath="..\..\src\generic\vscroll.cpp">
+ </File>
</Filter>
<Filter
Name="wxUniv Sources"
@@ -1927,601 +2047,601 @@
RelativePath="..\..\src\univ\bmpbuttn.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\button.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\checkbox.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\checklst.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\choice.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\combobox.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\control.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\ctrlrend.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\dialog.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\framuniv.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\gauge.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\themes\gtk.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\inpcons.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\inphand.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\listbox.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\menu.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\themes\metal.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\themes\mono.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\notebook.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\radiobox.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\radiobut.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\scrarrow.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\scrolbar.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\scrthumb.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\settingsuniv.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\slider.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\spinbutt.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\statbmp.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\statbox.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\statline.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\stattext.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\statusbr.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\stdrend.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\textctrl.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\tglbtn.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\theme.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\toolbar.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\topluniv.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\themes\win32.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\univ\winuniv.cpp">
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
</Filter>
<Filter
@@ -2626,101 +2746,149 @@
Name="MSW Headers"
UniqueIdentifier="{5AFFF20E-29F9-512B-B80A-7DC45976CDAC}">
<File
- RelativePath="..\..\include\wx\msw\accel.h"/>
+ RelativePath="..\..\include\wx\msw\accel.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\ole\access.h"/>
+ RelativePath="..\..\include\wx\msw\ole\access.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\ole\activex.h"/>
+ RelativePath="..\..\include\wx\msw\ole\activex.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\app.h"/>
+ RelativePath="..\..\include\wx\msw\app.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\ole\automtn.h"/>
+ RelativePath="..\..\include\wx\msw\ole\automtn.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\bitmap.h"/>
+ RelativePath="..\..\include\wx\msw\bitmap.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\bmpbuttn.h"/>
+ RelativePath="..\..\include\wx\msw\bmpbuttn.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\bmpcbox.h"/>
+ RelativePath="..\..\include\wx\msw\bmpcbox.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\brush.h"/>
+ RelativePath="..\..\include\wx\msw\brush.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\button.h"/>
+ RelativePath="..\..\include\wx\msw\button.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\calctrl.h"/>
+ RelativePath="..\..\include\wx\msw\calctrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\caret.h"/>
+ RelativePath="..\..\include\wx\msw\caret.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\checkbox.h"/>
+ RelativePath="..\..\include\wx\msw\checkbox.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\checklst.h"/>
+ RelativePath="..\..\include\wx\msw\checklst.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\choice.h"/>
+ RelativePath="..\..\include\wx\msw\choice.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\clipbrd.h"/>
+ RelativePath="..\..\include\wx\msw\clipbrd.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\colordlg.h"/>
+ RelativePath="..\..\include\wx\msw\colordlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\colour.h"/>
+ RelativePath="..\..\include\wx\msw\colour.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\combo.h"/>
+ RelativePath="..\..\include\wx\msw\combo.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\combobox.h"/>
+ RelativePath="..\..\include\wx\msw\combobox.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\control.h"/>
+ RelativePath="..\..\include\wx\msw\control.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\ctrlsub.h"/>
+ RelativePath="..\..\include\wx\msw\ctrlsub.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\cursor.h"/>
+ RelativePath="..\..\include\wx\msw\cursor.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\ole\dataform.h"/>
+ RelativePath="..\..\include\wx\msw\ole\dataform.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\ole\dataobj.h"/>
+ RelativePath="..\..\include\wx\msw\ole\dataobj.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\ole\dataobj2.h"/>
+ RelativePath="..\..\include\wx\msw\ole\dataobj2.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\datecontrols.h"/>
+ RelativePath="..\..\include\wx\msw\datecontrols.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\datectrl.h"/>
+ RelativePath="..\..\include\wx\msw\datectrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\dc.h"/>
+ RelativePath="..\..\include\wx\msw\dc.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\dcclient.h"/>
+ RelativePath="..\..\include\wx\msw\dcclient.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\dcmemory.h"/>
+ RelativePath="..\..\include\wx\msw\dcmemory.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\dcprint.h"/>
+ RelativePath="..\..\include\wx\msw\dcprint.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\dcscreen.h"/>
+ RelativePath="..\..\include\wx\msw\dcscreen.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\dialog.h"/>
+ RelativePath="..\..\include\wx\msw\dialog.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\dib.h"/>
+ RelativePath="..\..\include\wx\msw\dib.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\dirdlg.h"/>
+ RelativePath="..\..\include\wx\msw\dirdlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\dragimag.h"/>
+ RelativePath="..\..\include\wx\msw\dragimag.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\ole\dropsrc.h"/>
+ RelativePath="..\..\include\wx\msw\ole\dropsrc.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\ole\droptgt.h"/>
+ RelativePath="..\..\include\wx\msw\ole\droptgt.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\enhmeta.h"/>
+ RelativePath="..\..\include\wx\msw\enhmeta.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\evtloop.h"/>
+ RelativePath="..\..\include\wx\msw\evtloop.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\fdrepdlg.h"/>
+ RelativePath="..\..\include\wx\msw\fdrepdlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\filedlg.h"/>
+ RelativePath="..\..\include\wx\msw\filedlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\font.h"/>
+ RelativePath="..\..\include\wx\msw\font.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\fontdlg.h"/>
+ RelativePath="..\..\include\wx\msw\fontdlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\frame.h"/>
+ RelativePath="..\..\include\wx\msw\frame.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\gauge.h"/>
+ RelativePath="..\..\include\wx\msw\gauge.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\gdiimage.h"/>
+ RelativePath="..\..\include\wx\msw\gdiimage.h">
+ </File>
<File
RelativePath="..\..\include\wx\msw\genrcdefs.h">
<FileConfiguration
@@ -2797,911 +2965,1356 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\include\wx\msw\glcanvas.h"/>
+ RelativePath="..\..\include\wx\msw\glcanvas.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\helpbest.h"/>
+ RelativePath="..\..\include\wx\msw\helpbest.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\helpchm.h"/>
+ RelativePath="..\..\include\wx\msw\helpchm.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\helpwin.h"/>
+ RelativePath="..\..\include\wx\msw\helpwin.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\htmlhelp.h"/>
+ RelativePath="..\..\include\wx\msw\htmlhelp.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\icon.h"/>
+ RelativePath="..\..\include\wx\msw\icon.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\imaglist.h"/>
+ RelativePath="..\..\include\wx\msw\imaglist.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\iniconf.h"/>
+ RelativePath="..\..\include\wx\msw\iniconf.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\joystick.h"/>
+ RelativePath="..\..\include\wx\msw\joystick.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\listbox.h"/>
+ RelativePath="..\..\include\wx\msw\listbox.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\listctrl.h"/>
+ RelativePath="..\..\include\wx\msw\listctrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\mdi.h"/>
+ RelativePath="..\..\include\wx\msw\mdi.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\menu.h"/>
+ RelativePath="..\..\include\wx\msw\menu.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\menuitem.h"/>
+ RelativePath="..\..\include\wx\msw\menuitem.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\metafile.h"/>
+ RelativePath="..\..\include\wx\msw\metafile.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\minifram.h"/>
+ RelativePath="..\..\include\wx\msw\minifram.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\missing.h"/>
+ RelativePath="..\..\include\wx\msw\missing.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\msgdlg.h"/>
+ RelativePath="..\..\include\wx\msw\msgdlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\msvcrt.h"/>
+ RelativePath="..\..\include\wx\msw\msvcrt.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\notebook.h"/>
+ RelativePath="..\..\include\wx\msw\notebook.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\notifmsg.h"/>
+ RelativePath="..\..\include\wx\msw\notifmsg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\ole\oleutils.h"/>
+ RelativePath="..\..\include\wx\msw\ole\oleutils.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\palette.h"/>
+ RelativePath="..\..\include\wx\msw\palette.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\pen.h"/>
+ RelativePath="..\..\include\wx\msw\pen.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\popupwin.h"/>
+ RelativePath="..\..\include\wx\msw\popupwin.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\printdlg.h"/>
+ RelativePath="..\..\include\wx\msw\printdlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\printwin.h"/>
+ RelativePath="..\..\include\wx\msw\printwin.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\radiobox.h"/>
+ RelativePath="..\..\include\wx\msw\radiobox.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\radiobut.h"/>
+ RelativePath="..\..\include\wx\msw\radiobut.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\rcdefs.h"/>
+ RelativePath="..\..\include\wx\msw\rcdefs.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\region.h"/>
+ RelativePath="..\..\include\wx\msw\region.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\scrolbar.h"/>
+ RelativePath="..\..\include\wx\msw\scrolbar.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\setup0.h"/>
+ RelativePath="..\..\include\wx\msw\setup0.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\slider.h"/>
+ RelativePath="..\..\include\wx\msw\slider.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\sound.h"/>
+ RelativePath="..\..\include\wx\msw\sound.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\spinbutt.h"/>
+ RelativePath="..\..\include\wx\msw\spinbutt.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\spinctrl.h"/>
+ RelativePath="..\..\include\wx\msw\spinctrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\statbmp.h"/>
+ RelativePath="..\..\include\wx\msw\statbmp.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\statbox.h"/>
+ RelativePath="..\..\include\wx\msw\statbox.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\statline.h"/>
+ RelativePath="..\..\include\wx\msw\statline.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\stattext.h"/>
+ RelativePath="..\..\include\wx\msw\stattext.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\statusbar.h"/>
+ RelativePath="..\..\include\wx\msw\statusbar.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\tabctrl.h"/>
+ RelativePath="..\..\include\wx\msw\tabctrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\taskbar.h"/>
+ RelativePath="..\..\include\wx\msw\taskbar.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\textctrl.h"/>
+ RelativePath="..\..\include\wx\msw\textctrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\textentry.h"/>
+ RelativePath="..\..\include\wx\msw\textentry.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\tglbtn.h"/>
+ RelativePath="..\..\include\wx\msw\tglbtn.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\toolbar.h"/>
+ RelativePath="..\..\include\wx\msw\toolbar.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\tooltip.h"/>
+ RelativePath="..\..\include\wx\msw\tooltip.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\toplevel.h"/>
+ RelativePath="..\..\include\wx\msw\toplevel.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\treectrl.h"/>
+ RelativePath="..\..\include\wx\msw\treectrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\ole\uuid.h"/>
+ RelativePath="..\..\include\wx\msw\ole\uuid.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\uxtheme.h"/>
+ RelativePath="..\..\include\wx\msw\uxtheme.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\uxthemep.h"/>
+ RelativePath="..\..\include\wx\msw\uxthemep.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msw\window.h"/>
+ RelativePath="..\..\include\wx\msw\window.h">
+ </File>
</Filter>
<Filter
Name="Generic Headers"
UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}">
<File
- RelativePath="..\..\include\wx\generic\aboutdlgg.h"/>
+ RelativePath="..\..\include\wx\generic\aboutdlgg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\accel.h"/>
+ RelativePath="..\..\include\wx\generic\accel.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\animate.h"/>
+ RelativePath="..\..\include\wx\generic\animate.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\bmpcbox.h"/>
+ RelativePath="..\..\include\wx\generic\bmpcbox.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\busyinfo.h"/>
+ RelativePath="..\..\include\wx\generic\busyinfo.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\buttonbar.h"/>
+ RelativePath="..\..\include\wx\generic\buttonbar.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\calctrlg.h"/>
+ RelativePath="..\..\include\wx\generic\calctrlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\choicdgg.h"/>
+ RelativePath="..\..\include\wx\generic\choicdgg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\clrpickerg.h"/>
+ RelativePath="..\..\include\wx\generic\clrpickerg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\collpaneg.h"/>
+ RelativePath="..\..\include\wx\generic\collpaneg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\colrdlgg.h"/>
+ RelativePath="..\..\include\wx\generic\colrdlgg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\combo.h"/>
+ RelativePath="..\..\include\wx\generic\combo.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\ctrlsub.h"/>
+ RelativePath="..\..\include\wx\generic\ctrlsub.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\dataview.h"/>
+ RelativePath="..\..\include\wx\generic\dataview.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\datectrl.h"/>
+ RelativePath="..\..\include\wx\generic\datectrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\dcpsg.h"/>
+ RelativePath="..\..\include\wx\generic\dcpsg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\dirctrlg.h"/>
+ RelativePath="..\..\include\wx\generic\dirctrlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\dirdlgg.h"/>
+ RelativePath="..\..\include\wx\generic\dirdlgg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\dragimgg.h"/>
+ RelativePath="..\..\include\wx\generic\dragimgg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\fdrepdlg.h"/>
+ RelativePath="..\..\include\wx\generic\fdrepdlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\filectrlg.h"/>
+ RelativePath="..\..\include\wx\generic\filectrlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\filedlgg.h"/>
+ RelativePath="..\..\include\wx\generic\filedlgg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\filepickerg.h"/>
+ RelativePath="..\..\include\wx\generic\filepickerg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\fontdlgg.h"/>
+ RelativePath="..\..\include\wx\generic\fontdlgg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\fontpickerg.h"/>
+ RelativePath="..\..\include\wx\generic\fontpickerg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\grid.h"/>
+ RelativePath="..\..\include\wx\generic\grid.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\gridctrl.h"/>
+ RelativePath="..\..\include\wx\generic\gridctrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\gridsel.h"/>
+ RelativePath="..\..\include\wx\generic\gridsel.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\helpext.h"/>
+ RelativePath="..\..\include\wx\generic\helpext.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\hyperlink.h"/>
+ RelativePath="..\..\include\wx\generic\hyperlink.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\laywin.h"/>
+ RelativePath="..\..\include\wx\generic\laywin.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\listctrl.h"/>
+ RelativePath="..\..\include\wx\generic\listctrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\logg.h"/>
+ RelativePath="..\..\include\wx\generic\logg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\mdig.h"/>
+ RelativePath="..\..\include\wx\generic\mdig.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\msgdlgg.h"/>
+ RelativePath="..\..\include\wx\generic\msgdlgg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\notebook.h"/>
+ RelativePath="..\..\include\wx\generic\notebook.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\notifmsg.h"/>
+ RelativePath="..\..\include\wx\generic\notifmsg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\numdlgg.h"/>
+ RelativePath="..\..\include\wx\generic\numdlgg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\panelg.h"/>
+ RelativePath="..\..\include\wx\generic\panelg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\printps.h"/>
+ RelativePath="..\..\include\wx\generic\printps.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\prntdlgg.h"/>
+ RelativePath="..\..\include\wx\generic\prntdlgg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\progdlgg.h"/>
+ RelativePath="..\..\include\wx\generic\progdlgg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\propdlg.h"/>
+ RelativePath="..\..\include\wx\generic\propdlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\sashwin.h"/>
+ RelativePath="..\..\include\wx\generic\sashwin.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\scrolwin.h"/>
+ RelativePath="..\..\include\wx\generic\scrolwin.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\spinctlg.h"/>
+ RelativePath="..\..\include\wx\generic\spinctlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\splash.h"/>
+ RelativePath="..\..\include\wx\generic\splash.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\splitter.h"/>
+ RelativePath="..\..\include\wx\generic\splitter.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\srchctlg.h"/>
+ RelativePath="..\..\include\wx\generic\srchctlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\statbmpg.h"/>
+ RelativePath="..\..\include\wx\generic\statbmpg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\statusbr.h"/>
+ RelativePath="..\..\include\wx\generic\statusbr.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\tabg.h"/>
+ RelativePath="..\..\include\wx\generic\tabg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\textdlgg.h"/>
+ RelativePath="..\..\include\wx\generic\textdlgg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\treectlg.h"/>
+ RelativePath="..\..\include\wx\generic\treectlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\generic\wizard.h"/>
+ RelativePath="..\..\include\wx\generic\wizard.h">
+ </File>
</Filter>
<Filter
Name="wxUniv Headers"
UniqueIdentifier="{46168D7C-2783-50F3-AE9D-A740D5FF0B44}">
<File
- RelativePath="..\..\include\wx\univ\app.h"/>
+ RelativePath="..\..\include\wx\univ\app.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\bmpbuttn.h"/>
+ RelativePath="..\..\include\wx\univ\bmpbuttn.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\button.h"/>
+ RelativePath="..\..\include\wx\univ\button.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\checkbox.h"/>
+ RelativePath="..\..\include\wx\univ\checkbox.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\checklst.h"/>
+ RelativePath="..\..\include\wx\univ\checklst.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\chkconf.h"/>
+ RelativePath="..\..\include\wx\univ\chkconf.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\choice.h"/>
+ RelativePath="..\..\include\wx\univ\choice.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\colschem.h"/>
+ RelativePath="..\..\include\wx\univ\colschem.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\combobox.h"/>
+ RelativePath="..\..\include\wx\univ\combobox.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\control.h"/>
+ RelativePath="..\..\include\wx\univ\control.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\dialog.h"/>
+ RelativePath="..\..\include\wx\univ\dialog.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\frame.h"/>
+ RelativePath="..\..\include\wx\univ\frame.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\gauge.h"/>
+ RelativePath="..\..\include\wx\univ\gauge.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\inpcons.h"/>
+ RelativePath="..\..\include\wx\univ\inpcons.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\inphand.h"/>
+ RelativePath="..\..\include\wx\univ\inphand.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\listbox.h"/>
+ RelativePath="..\..\include\wx\univ\listbox.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\menu.h"/>
+ RelativePath="..\..\include\wx\univ\menu.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\menuitem.h"/>
+ RelativePath="..\..\include\wx\univ\menuitem.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\notebook.h"/>
+ RelativePath="..\..\include\wx\univ\notebook.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\radiobox.h"/>
+ RelativePath="..\..\include\wx\univ\radiobox.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\radiobut.h"/>
+ RelativePath="..\..\include\wx\univ\radiobut.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\renderer.h"/>
+ RelativePath="..\..\include\wx\univ\renderer.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\scrarrow.h"/>
+ RelativePath="..\..\include\wx\univ\scrarrow.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\scrolbar.h"/>
+ RelativePath="..\..\include\wx\univ\scrolbar.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\scrthumb.h"/>
+ RelativePath="..\..\include\wx\univ\scrthumb.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\scrtimer.h"/>
+ RelativePath="..\..\include\wx\univ\scrtimer.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\slider.h"/>
+ RelativePath="..\..\include\wx\univ\slider.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\spinbutt.h"/>
+ RelativePath="..\..\include\wx\univ\spinbutt.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\statbmp.h"/>
+ RelativePath="..\..\include\wx\univ\statbmp.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\statbox.h"/>
+ RelativePath="..\..\include\wx\univ\statbox.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\statline.h"/>
+ RelativePath="..\..\include\wx\univ\statline.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\stattext.h"/>
+ RelativePath="..\..\include\wx\univ\stattext.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\statusbr.h"/>
+ RelativePath="..\..\include\wx\univ\statusbr.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\stdrend.h"/>
+ RelativePath="..\..\include\wx\univ\stdrend.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\textctrl.h"/>
+ RelativePath="..\..\include\wx\univ\textctrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\tglbtn.h"/>
+ RelativePath="..\..\include\wx\univ\tglbtn.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\theme.h"/>
+ RelativePath="..\..\include\wx\univ\theme.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\toolbar.h"/>
+ RelativePath="..\..\include\wx\univ\toolbar.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\toplevel.h"/>
+ RelativePath="..\..\include\wx\univ\toplevel.h">
+ </File>
<File
- RelativePath="..\..\include\wx\univ\window.h"/>
+ RelativePath="..\..\include\wx\univ\window.h">
+ </File>
</Filter>
<Filter
Name="wxHTML Headers"
UniqueIdentifier="{B4103426-A5DB-5CF0-A30E-BC9546513AAF}">
<File
- RelativePath="..\..\include\wx\html\helpctrl.h"/>
+ RelativePath="..\..\include\wx\html\helpctrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\html\helpdata.h"/>
+ RelativePath="..\..\include\wx\html\helpdata.h">
+ </File>
<File
- RelativePath="..\..\include\wx\html\helpdlg.h"/>
+ RelativePath="..\..\include\wx\html\helpdlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\html\helpfrm.h"/>
+ RelativePath="..\..\include\wx\html\helpfrm.h">
+ </File>
<File
- RelativePath="..\..\include\wx\html\helpwnd.h"/>
+ RelativePath="..\..\include\wx\html\helpwnd.h">
+ </File>
<File
- RelativePath="..\..\include\wx\html\htmlcell.h"/>
+ RelativePath="..\..\include\wx\html\htmlcell.h">
+ </File>
<File
- RelativePath="..\..\include\wx\html\htmldefs.h"/>
+ RelativePath="..\..\include\wx\html\htmldefs.h">
+ </File>
<File
- RelativePath="..\..\include\wx\html\htmlfilt.h"/>
+ RelativePath="..\..\include\wx\html\htmlfilt.h">
+ </File>
<File
- RelativePath="..\..\include\wx\html\htmlpars.h"/>
+ RelativePath="..\..\include\wx\html\htmlpars.h">
+ </File>
<File
- RelativePath="..\..\include\wx\html\htmlproc.h"/>
+ RelativePath="..\..\include\wx\html\htmlproc.h">
+ </File>
<File
- RelativePath="..\..\include\wx\html\htmltag.h"/>
+ RelativePath="..\..\include\wx\html\htmltag.h">
+ </File>
<File
- RelativePath="..\..\include\wx\html\htmlwin.h"/>
+ RelativePath="..\..\include\wx\html\htmlwin.h">
+ </File>
<File
- RelativePath="..\..\include\wx\html\htmprint.h"/>
+ RelativePath="..\..\include\wx\html\htmprint.h">
+ </File>
<File
- RelativePath="..\..\include\wx\html\m_templ.h"/>
+ RelativePath="..\..\include\wx\html\m_templ.h">
+ </File>
<File
- RelativePath="..\..\include\wx\html\winpars.h"/>
+ RelativePath="..\..\include\wx\html\winpars.h">
+ </File>
</Filter>
<Filter
Name="Common Headers"
UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}">
<File
- RelativePath="..\..\include\wx\aboutdlg.h"/>
+ RelativePath="..\..\include\wx\aboutdlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\accel.h"/>
+ RelativePath="..\..\include\wx\accel.h">
+ </File>
<File
- RelativePath="..\..\include\wx\access.h"/>
+ RelativePath="..\..\include\wx\access.h">
+ </File>
<File
- RelativePath="..\..\include\wx\propgrid\advprops.h"/>
+ RelativePath="..\..\include\wx\propgrid\advprops.h">
+ </File>
<File
- RelativePath="..\..\include\wx\anidecod.h"/>
+ RelativePath="..\..\include\wx\anidecod.h">
+ </File>
<File
- RelativePath="..\..\include\wx\animate.h"/>
+ RelativePath="..\..\include\wx\animate.h">
+ </File>
<File
- RelativePath="..\..\include\wx\animdecod.h"/>
+ RelativePath="..\..\include\wx\animdecod.h">
+ </File>
<File
- RelativePath="..\..\include\wx\artprov.h"/>
+ RelativePath="..\..\include\wx\artprov.h">
+ </File>
<File
- RelativePath="..\..\include\wx\aui\aui.h"/>
+ RelativePath="..\..\include\wx\aui\aui.h">
+ </File>
<File
- RelativePath="..\..\include\wx\aui\auibar.h"/>
+ RelativePath="..\..\include\wx\aui\auibar.h">
+ </File>
<File
- RelativePath="..\..\include\wx\aui\auibook.h"/>
+ RelativePath="..\..\include\wx\aui\auibook.h">
+ </File>
<File
- RelativePath="..\..\include\wx\bitmap.h"/>
+ RelativePath="..\..\include\wx\bitmap.h">
+ </File>
<File
- RelativePath="..\..\include\wx\bmpbuttn.h"/>
+ RelativePath="..\..\include\wx\bmpbuttn.h">
+ </File>
<File
- RelativePath="..\..\include\wx\bmpcbox.h"/>
+ RelativePath="..\..\include\wx\bmpcbox.h">
+ </File>
<File
- RelativePath="..\..\include\wx\bookctrl.h"/>
+ RelativePath="..\..\include\wx\bookctrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\brush.h"/>
+ RelativePath="..\..\include\wx\brush.h">
+ </File>
<File
- RelativePath="..\..\include\wx\busyinfo.h"/>
+ RelativePath="..\..\include\wx\busyinfo.h">
+ </File>
<File
- RelativePath="..\..\include\wx\button.h"/>
+ RelativePath="..\..\include\wx\button.h">
+ </File>
<File
- RelativePath="..\..\include\wx\cairo.h"/>
+ RelativePath="..\..\include\wx\cairo.h">
+ </File>
<File
- RelativePath="..\..\include\wx\calctrl.h"/>
+ RelativePath="..\..\include\wx\calctrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\caret.h"/>
+ RelativePath="..\..\include\wx\caret.h">
+ </File>
<File
- RelativePath="..\..\include\wx\checkbox.h"/>
+ RelativePath="..\..\include\wx\checkbox.h">
+ </File>
<File
- RelativePath="..\..\include\wx\checklst.h"/>
+ RelativePath="..\..\include\wx\checklst.h">
+ </File>
<File
- RelativePath="..\..\include\wx\choicdlg.h"/>
+ RelativePath="..\..\include\wx\choicdlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\choice.h"/>
+ RelativePath="..\..\include\wx\choice.h">
+ </File>
<File
- RelativePath="..\..\include\wx\choicebk.h"/>
+ RelativePath="..\..\include\wx\choicebk.h">
+ </File>
<File
- RelativePath="..\..\include\wx\clipbrd.h"/>
+ RelativePath="..\..\include\wx\clipbrd.h">
+ </File>
<File
- RelativePath="..\..\include\wx\clrpicker.h"/>
+ RelativePath="..\..\include\wx\clrpicker.h">
+ </File>
<File
- RelativePath="..\..\include\wx\cmdproc.h"/>
+ RelativePath="..\..\include\wx\cmdproc.h">
+ </File>
<File
- RelativePath="..\..\include\wx\cmndata.h"/>
+ RelativePath="..\..\include\wx\cmndata.h">
+ </File>
<File
- RelativePath="..\..\include\wx\collpane.h"/>
+ RelativePath="..\..\include\wx\collpane.h">
+ </File>
<File
- RelativePath="..\..\include\wx\colordlg.h"/>
+ RelativePath="..\..\include\wx\colordlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\colour.h"/>
+ RelativePath="..\..\include\wx\colour.h">
+ </File>
<File
- RelativePath="..\..\include\wx\combo.h"/>
+ RelativePath="..\..\include\wx\combo.h">
+ </File>
<File
- RelativePath="..\..\include\wx\combobox.h"/>
+ RelativePath="..\..\include\wx\combobox.h">
+ </File>
<File
- RelativePath="..\..\include\wx\control.h"/>
+ RelativePath="..\..\include\wx\control.h">
+ </File>
<File
- RelativePath="..\..\include\wx\cshelp.h"/>
+ RelativePath="..\..\include\wx\cshelp.h">
+ </File>
<File
- RelativePath="..\..\include\wx\ctrlsub.h"/>
+ RelativePath="..\..\include\wx\ctrlsub.h">
+ </File>
<File
- RelativePath="..\..\include\wx\cursor.h"/>
+ RelativePath="..\..\include\wx\cursor.h">
+ </File>
<File
- RelativePath="..\..\include\wx\dataobj.h"/>
+ RelativePath="..\..\include\wx\dataobj.h">
+ </File>
<File
- RelativePath="..\..\include\wx\dataview.h"/>
+ RelativePath="..\..\include\wx\dataview.h">
+ </File>
<File
- RelativePath="..\..\include\wx\datectrl.h"/>
+ RelativePath="..\..\include\wx\datectrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\dateevt.h"/>
+ RelativePath="..\..\include\wx\dateevt.h">
+ </File>
<File
- RelativePath="..\..\include\wx\dc.h"/>
+ RelativePath="..\..\include\wx\dc.h">
+ </File>
<File
- RelativePath="..\..\include\wx\dcbuffer.h"/>
+ RelativePath="..\..\include\wx\dcbuffer.h">
+ </File>
<File
- RelativePath="..\..\include\wx\dcclient.h"/>
+ RelativePath="..\..\include\wx\dcclient.h">
+ </File>
<File
- RelativePath="..\..\include\wx\dcgraph.h"/>
+ RelativePath="..\..\include\wx\dcgraph.h">
+ </File>
<File
- RelativePath="..\..\include\wx\dcmemory.h"/>
+ RelativePath="..\..\include\wx\dcmemory.h">
+ </File>
<File
- RelativePath="..\..\include\wx\dcmirror.h"/>
+ RelativePath="..\..\include\wx\dcmirror.h">
+ </File>
<File
- RelativePath="..\..\include\wx\dcprint.h"/>
+ RelativePath="..\..\include\wx\dcprint.h">
+ </File>
<File
- RelativePath="..\..\include\wx\dcps.h"/>
+ RelativePath="..\..\include\wx\dcps.h">
+ </File>
<File
- RelativePath="..\..\include\wx\dcscreen.h"/>
+ RelativePath="..\..\include\wx\dcscreen.h">
+ </File>
<File
- RelativePath="..\..\include\wx\dcsvg.h"/>
+ RelativePath="..\..\include\wx\dcsvg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\debugrpt.h"/>
+ RelativePath="..\..\include\wx\debugrpt.h">
+ </File>
<File
- RelativePath="..\..\include\wx\dialog.h"/>
+ RelativePath="..\..\include\wx\dialog.h">
+ </File>
<File
- RelativePath="..\..\include\wx\dialup.h"/>
+ RelativePath="..\..\include\wx\dialup.h">
+ </File>
<File
- RelativePath="..\..\include\wx\dirctrl.h"/>
+ RelativePath="..\..\include\wx\dirctrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\dirdlg.h"/>
+ RelativePath="..\..\include\wx\dirdlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\display.h"/>
+ RelativePath="..\..\include\wx\display.h">
+ </File>
<File
- RelativePath="..\..\include\wx\display_impl.h"/>
+ RelativePath="..\..\include\wx\display_impl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\dnd.h"/>
+ RelativePath="..\..\include\wx\dnd.h">
+ </File>
<File
- RelativePath="..\..\include\wx\aui\dockart.h"/>
+ RelativePath="..\..\include\wx\aui\dockart.h">
+ </File>
<File
- RelativePath="..\..\include\wx\docmdi.h"/>
+ RelativePath="..\..\include\wx\docmdi.h">
+ </File>
<File
- RelativePath="..\..\include\wx\docview.h"/>
+ RelativePath="..\..\include\wx\docview.h">
+ </File>
<File
- RelativePath="..\..\include\wx\dragimag.h"/>
+ RelativePath="..\..\include\wx\dragimag.h">
+ </File>
<File
- RelativePath="..\..\include\wx\editlbox.h"/>
+ RelativePath="..\..\include\wx\editlbox.h">
+ </File>
<File
- RelativePath="..\..\include\wx\propgrid\editors.h"/>
+ RelativePath="..\..\include\wx\propgrid\editors.h">
+ </File>
<File
- RelativePath="..\..\include\wx\effects.h"/>
+ RelativePath="..\..\include\wx\effects.h">
+ </File>
<File
- RelativePath="..\..\include\wx\encinfo.h"/>
+ RelativePath="..\..\include\wx\encinfo.h">
+ </File>
<File
- RelativePath="..\..\include\wx\evtloop.h"/>
+ RelativePath="..\..\include\wx\evtloop.h">
+ </File>
<File
- RelativePath="..\..\include\wx\fdrepdlg.h"/>
+ RelativePath="..\..\include\wx\fdrepdlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\filectrl.h"/>
+ RelativePath="..\..\include\wx\filectrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\filedlg.h"/>
+ RelativePath="..\..\include\wx\filedlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\filepicker.h"/>
+ RelativePath="..\..\include\wx\filepicker.h">
+ </File>
<File
- RelativePath="..\..\include\wx\aui\floatpane.h"/>
+ RelativePath="..\..\include\wx\aui\floatpane.h">
+ </File>
<File
- RelativePath="..\..\include\wx\fmappriv.h"/>
+ RelativePath="..\..\include\wx\fmappriv.h">
+ </File>
<File
- RelativePath="..\..\include\wx\font.h"/>
+ RelativePath="..\..\include\wx\font.h">
+ </File>
<File
- RelativePath="..\..\include\wx\fontdlg.h"/>
+ RelativePath="..\..\include\wx\fontdlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\fontenum.h"/>
+ RelativePath="..\..\include\wx\fontenum.h">
+ </File>
<File
- RelativePath="..\..\include\wx\fontpicker.h"/>
+ RelativePath="..\..\include\wx\fontpicker.h">
+ </File>
<File
- RelativePath="..\..\include\wx\fontutil.h"/>
+ RelativePath="..\..\include\wx\fontutil.h">
+ </File>
<File
- RelativePath="..\..\include\wx\frame.h"/>
+ RelativePath="..\..\include\wx\frame.h">
+ </File>
<File
- RelativePath="..\..\include\wx\aui\framemanager.h"/>
+ RelativePath="..\..\include\wx\aui\framemanager.h">
+ </File>
<File
- RelativePath="..\..\include\wx\gauge.h"/>
+ RelativePath="..\..\include\wx\gauge.h">
+ </File>
<File
- RelativePath="..\..\include\wx\gbsizer.h"/>
+ RelativePath="..\..\include\wx\gbsizer.h">
+ </File>
<File
- RelativePath="..\..\include\wx\gdicmn.h"/>
+ RelativePath="..\..\include\wx\gdicmn.h">
+ </File>
<File
- RelativePath="..\..\include\wx\gdiobj.h"/>
+ RelativePath="..\..\include\wx\gdiobj.h">
+ </File>
<File
- RelativePath="..\..\include\wx\geometry.h"/>
+ RelativePath="..\..\include\wx\geometry.h">
+ </File>
<File
- RelativePath="..\..\include\wx\gifdecod.h"/>
+ RelativePath="..\..\include\wx\gifdecod.h">
+ </File>
<File
- RelativePath="..\..\include\wx\glcanvas.h"/>
+ RelativePath="..\..\include\wx\glcanvas.h">
+ </File>
<File
- RelativePath="..\..\include\wx\graphics.h"/>
+ RelativePath="..\..\include\wx\graphics.h">
+ </File>
<File
- RelativePath="..\..\include\wx\grid.h"/>
+ RelativePath="..\..\include\wx\grid.h">
+ </File>
<File
- RelativePath="..\..\include\wx\help.h"/>
+ RelativePath="..\..\include\wx\help.h">
+ </File>
<File
- RelativePath="..\..\include\wx\helpbase.h"/>
+ RelativePath="..\..\include\wx\helpbase.h">
+ </File>
<File
- RelativePath="..\..\include\wx\helphtml.h"/>
+ RelativePath="..\..\include\wx\helphtml.h">
+ </File>
<File
- RelativePath="..\..\include\wx\helpwin.h"/>
+ RelativePath="..\..\include\wx\helpwin.h">
+ </File>
<File
- RelativePath="..\..\include\wx\htmllbox.h"/>
+ RelativePath="..\..\include\wx\htmllbox.h">
+ </File>
<File
- RelativePath="..\..\include\wx\hyperlink.h"/>
+ RelativePath="..\..\include\wx\hyperlink.h">
+ </File>
<File
- RelativePath="..\..\include\wx\icon.h"/>
+ RelativePath="..\..\include\wx\icon.h">
+ </File>
<File
- RelativePath="..\..\include\wx\iconbndl.h"/>
+ RelativePath="..\..\include\wx\iconbndl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\imagbmp.h"/>
+ RelativePath="..\..\include\wx\imagbmp.h">
+ </File>
<File
- RelativePath="..\..\include\wx\image.h"/>
+ RelativePath="..\..\include\wx\image.h">
+ </File>
<File
- RelativePath="..\..\include\wx\imaggif.h"/>
+ RelativePath="..\..\include\wx\imaggif.h">
+ </File>
<File
- RelativePath="..\..\include\wx\imagiff.h"/>
+ RelativePath="..\..\include\wx\imagiff.h">
+ </File>
<File
- RelativePath="..\..\include\wx\imagjpeg.h"/>
+ RelativePath="..\..\include\wx\imagjpeg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\imaglist.h"/>
+ RelativePath="..\..\include\wx\imaglist.h">
+ </File>
<File
- RelativePath="..\..\include\wx\imagpcx.h"/>
+ RelativePath="..\..\include\wx\imagpcx.h">
+ </File>
<File
- RelativePath="..\..\include\wx\imagpng.h"/>
+ RelativePath="..\..\include\wx\imagpng.h">
+ </File>
<File
- RelativePath="..\..\include\wx\imagpnm.h"/>
+ RelativePath="..\..\include\wx\imagpnm.h">
+ </File>
<File
- RelativePath="..\..\include\wx\imagtga.h"/>
+ RelativePath="..\..\include\wx\imagtga.h">
+ </File>
<File
- RelativePath="..\..\include\wx\imagtiff.h"/>
+ RelativePath="..\..\include\wx\imagtiff.h">
+ </File>
<File
- RelativePath="..\..\include\wx\imagxpm.h"/>
+ RelativePath="..\..\include\wx\imagxpm.h">
+ </File>
<File
- RelativePath="..\..\include\wx\joystick.h"/>
+ RelativePath="..\..\include\wx\joystick.h">
+ </File>
<File
- RelativePath="..\..\include\wx\layout.h"/>
+ RelativePath="..\..\include\wx\layout.h">
+ </File>
<File
- RelativePath="..\..\include\wx\laywin.h"/>
+ RelativePath="..\..\include\wx\laywin.h">
+ </File>
<File
- RelativePath="..\..\include\wx\listbase.h"/>
+ RelativePath="..\..\include\wx\listbase.h">
+ </File>
<File
- RelativePath="..\..\include\wx\listbook.h"/>
+ RelativePath="..\..\include\wx\listbook.h">
+ </File>
<File
- RelativePath="..\..\include\wx\listbox.h"/>
+ RelativePath="..\..\include\wx\listbox.h">
+ </File>
<File
- RelativePath="..\..\include\wx\listctrl.h"/>
+ RelativePath="..\..\include\wx\listctrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\propgrid\manager.h"/>
+ RelativePath="..\..\include\wx\propgrid\manager.h">
+ </File>
<File
- RelativePath="..\..\include\wx\matrix.h"/>
+ RelativePath="..\..\include\wx\matrix.h">
+ </File>
<File
- RelativePath="..\..\include\wx\mdi.h"/>
+ RelativePath="..\..\include\wx\mdi.h">
+ </File>
<File
- RelativePath="..\..\include\wx\mediactrl.h"/>
+ RelativePath="..\..\include\wx\mediactrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\menu.h"/>
+ RelativePath="..\..\include\wx\menu.h">
+ </File>
<File
- RelativePath="..\..\include\wx\menuitem.h"/>
+ RelativePath="..\..\include\wx\menuitem.h">
+ </File>
<File
- RelativePath="..\..\include\wx\metafile.h"/>
+ RelativePath="..\..\include\wx\metafile.h">
+ </File>
<File
- RelativePath="..\..\include\wx\minifram.h"/>
+ RelativePath="..\..\include\wx\minifram.h">
+ </File>
<File
- RelativePath="..\..\include\wx\msgdlg.h"/>
+ RelativePath="..\..\include\wx\msgdlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\nativewin.h"/>
+ RelativePath="..\..\include\wx\nativewin.h">
+ </File>
<File
- RelativePath="..\..\include\wx\nonownedwnd.h"/>
+ RelativePath="..\..\include\wx\nonownedwnd.h">
+ </File>
<File
- RelativePath="..\..\include\wx\notebook.h"/>
+ RelativePath="..\..\include\wx\notebook.h">
+ </File>
<File
- RelativePath="..\..\include\wx\notifmsg.h"/>
+ RelativePath="..\..\include\wx\notifmsg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\numdlg.h"/>
+ RelativePath="..\..\include\wx\numdlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\odcombo.h"/>
+ RelativePath="..\..\include\wx\odcombo.h">
+ </File>
<File
- RelativePath="..\..\include\wx\overlay.h"/>
+ RelativePath="..\..\include\wx\overlay.h">
+ </File>
<File
- RelativePath="..\..\include\wx\ownerdrw.h"/>
+ RelativePath="..\..\include\wx\ownerdrw.h">
+ </File>
<File
- RelativePath="..\..\include\wx\palette.h"/>
+ RelativePath="..\..\include\wx\palette.h">
+ </File>
<File
- RelativePath="..\..\include\wx\panel.h"/>
+ RelativePath="..\..\include\wx\panel.h">
+ </File>
<File
- RelativePath="..\..\include\wx\paper.h"/>
+ RelativePath="..\..\include\wx\paper.h">
+ </File>
<File
- RelativePath="..\..\include\wx\pen.h"/>
+ RelativePath="..\..\include\wx\pen.h">
+ </File>
<File
- RelativePath="..\..\include\wx\pickerbase.h"/>
+ RelativePath="..\..\include\wx\pickerbase.h">
+ </File>
<File
- RelativePath="..\..\include\wx\popupwin.h"/>
+ RelativePath="..\..\include\wx\popupwin.h">
+ </File>
<File
- RelativePath="..\..\include\wx\position.h"/>
+ RelativePath="..\..\include\wx\position.h">
+ </File>
<File
- RelativePath="..\..\include\wx\print.h"/>
+ RelativePath="..\..\include\wx\print.h">
+ </File>
<File
- RelativePath="..\..\include\wx\printdlg.h"/>
+ RelativePath="..\..\include\wx\printdlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\prntbase.h"/>
+ RelativePath="..\..\include\wx\prntbase.h">
+ </File>
<File
- RelativePath="..\..\include\wx\progdlg.h"/>
+ RelativePath="..\..\include\wx\progdlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\propdlg.h"/>
+ RelativePath="..\..\include\wx\propdlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\propgrid\property.h"/>
+ RelativePath="..\..\include\wx\propgrid\property.h">
+ </File>
<File
- RelativePath="..\..\include\wx\propgrid\propgrid.h"/>
+ RelativePath="..\..\include\wx\propgrid\propgrid.h">
+ </File>
<File
- RelativePath="..\..\include\wx\propgrid\propgriddefs.h"/>
+ RelativePath="..\..\include\wx\propgrid\propgriddefs.h">
+ </File>
<File
- RelativePath="..\..\include\wx\propgrid\propgridiface.h"/>
+ RelativePath="..\..\include\wx\propgrid\propgridiface.h">
+ </File>
<File
- RelativePath="..\..\include\wx\propgrid\propgridpagestate.h"/>
+ RelativePath="..\..\include\wx\propgrid\propgridpagestate.h">
+ </File>
<File
- RelativePath="..\..\include\wx\propgrid\props.h"/>
+ RelativePath="..\..\include\wx\propgrid\props.h">
+ </File>
<File
- RelativePath="..\..\include\wx\quantize.h"/>
+ RelativePath="..\..\include\wx\quantize.h">
+ </File>
<File
- RelativePath="..\..\include\wx\radiobox.h"/>
+ RelativePath="..\..\include\wx\radiobox.h">
+ </File>
<File
- RelativePath="..\..\include\wx\radiobut.h"/>
+ RelativePath="..\..\include\wx\radiobut.h">
+ </File>
<File
- RelativePath="..\..\include\wx\rawbmp.h"/>
+ RelativePath="..\..\include\wx\rawbmp.h">
+ </File>
<File
- RelativePath="..\..\include\wx\region.h"/>
+ RelativePath="..\..\include\wx\region.h">
+ </File>
<File
- RelativePath="..\..\include\wx\renderer.h"/>
+ RelativePath="..\..\include\wx\renderer.h">
+ </File>
<File
- RelativePath="..\..\include\wx\richtext\richtextbuffer.h"/>
+ RelativePath="..\..\include\wx\richtext\richtextbuffer.h">
+ </File>
<File
- RelativePath="..\..\include\wx\richtext\richtextctrl.h"/>
+ RelativePath="..\..\include\wx\richtext\richtextctrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\richtext\richtextformatdlg.h"/>
+ RelativePath="..\..\include\wx\richtext\richtextformatdlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\richtext\richtexthtml.h"/>
+ RelativePath="..\..\include\wx\richtext\richtexthtml.h">
+ </File>
<File
- RelativePath="..\..\include\wx\richtext\richtextprint.h"/>
+ RelativePath="..\..\include\wx\richtext\richtextprint.h">
+ </File>
<File
- RelativePath="..\..\include\wx\richtext\richtextstyledlg.h"/>
+ RelativePath="..\..\include\wx\richtext\richtextstyledlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\richtext\richtextstyles.h"/>
+ RelativePath="..\..\include\wx\richtext\richtextstyles.h">
+ </File>
<File
- RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h"/>
+ RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\richtext\richtextxml.h"/>
+ RelativePath="..\..\include\wx\richtext\richtextxml.h">
+ </File>
<File
- RelativePath="..\..\include\wx\sashwin.h"/>
+ RelativePath="..\..\include\wx\sashwin.h">
+ </File>
<File
- RelativePath="..\..\include\wx\scopeguard.h"/>
+ RelativePath="..\..\include\wx\scopeguard.h">
+ </File>
<File
- RelativePath="..\..\include\wx\scrolbar.h"/>
+ RelativePath="..\..\include\wx\scrolbar.h">
+ </File>
<File
- RelativePath="..\..\include\wx\scrolwin.h"/>
+ RelativePath="..\..\include\wx\scrolwin.h">
+ </File>
<File
- RelativePath="..\..\include\wx\selstore.h"/>
+ RelativePath="..\..\include\wx\selstore.h">
+ </File>
<File
- RelativePath="..\..\include\wx\settings.h"/>
+ RelativePath="..\..\include\wx\settings.h">
+ </File>
<File
- RelativePath="..\..\include\wx\sizer.h"/>
+ RelativePath="..\..\include\wx\sizer.h">
+ </File>
<File
- RelativePath="..\..\include\wx\slider.h"/>
+ RelativePath="..\..\include\wx\slider.h">
+ </File>
<File
- RelativePath="..\..\include\wx\sound.h"/>
+ RelativePath="..\..\include\wx\sound.h">
+ </File>
<File
- RelativePath="..\..\include\wx\spinbutt.h"/>
+ RelativePath="..\..\include\wx\spinbutt.h">
+ </File>
<File
- RelativePath="..\..\include\wx\spinctrl.h"/>
+ RelativePath="..\..\include\wx\spinctrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\splash.h"/>
+ RelativePath="..\..\include\wx\splash.h">
+ </File>
<File
- RelativePath="..\..\include\wx\splitter.h"/>
+ RelativePath="..\..\include\wx\splitter.h">
+ </File>
<File
- RelativePath="..\..\include\wx\srchctrl.h"/>
+ RelativePath="..\..\include\wx\srchctrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\statbmp.h"/>
+ RelativePath="..\..\include\wx\statbmp.h">
+ </File>
<File
- RelativePath="..\..\include\wx\statbox.h"/>
+ RelativePath="..\..\include\wx\statbox.h">
+ </File>
<File
- RelativePath="..\..\include\wx\statline.h"/>
+ RelativePath="..\..\include\wx\statline.h">
+ </File>
<File
- RelativePath="..\..\include\wx\stattext.h"/>
+ RelativePath="..\..\include\wx\stattext.h">
+ </File>
<File
- RelativePath="..\..\include\wx\statusbr.h"/>
+ RelativePath="..\..\include\wx\statusbr.h">
+ </File>
<File
- RelativePath="..\..\include\wx\stc\stc.h"/>
+ RelativePath="..\..\include\wx\stc\stc.h">
+ </File>
<File
- RelativePath="..\..\include\wx\tab.h"/>
+ RelativePath="..\..\include\wx\tab.h">
+ </File>
<File
- RelativePath="..\..\include\wx\tabctrl.h"/>
+ RelativePath="..\..\include\wx\tabctrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\aui\tabmdi.h"/>
+ RelativePath="..\..\include\wx\aui\tabmdi.h">
+ </File>
<File
- RelativePath="..\..\include\wx\taskbar.h"/>
+ RelativePath="..\..\include\wx\taskbar.h">
+ </File>
<File
- RelativePath="..\..\include\wx\tbarbase.h"/>
+ RelativePath="..\..\include\wx\tbarbase.h">
+ </File>
<File
- RelativePath="..\..\include\wx\textctrl.h"/>
+ RelativePath="..\..\include\wx\textctrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\textdlg.h"/>
+ RelativePath="..\..\include\wx\textdlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\textentry.h"/>
+ RelativePath="..\..\include\wx\textentry.h">
+ </File>
<File
- RelativePath="..\..\include\wx\tglbtn.h"/>
+ RelativePath="..\..\include\wx\tglbtn.h">
+ </File>
<File
- RelativePath="..\..\include\wx\tipdlg.h"/>
+ RelativePath="..\..\include\wx\tipdlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\tipwin.h"/>
+ RelativePath="..\..\include\wx\tipwin.h">
+ </File>
<File
- RelativePath="..\..\include\wx\tls.h"/>
+ RelativePath="..\..\include\wx\tls.h">
+ </File>
<File
- RelativePath="..\..\include\wx\toolbar.h"/>
+ RelativePath="..\..\include\wx\toolbar.h">
+ </File>
<File
- RelativePath="..\..\include\wx\toolbook.h"/>
+ RelativePath="..\..\include\wx\toolbook.h">
+ </File>
<File
- RelativePath="..\..\include\wx\tooltip.h"/>
+ RelativePath="..\..\include\wx\tooltip.h">
+ </File>
<File
- RelativePath="..\..\include\wx\toplevel.h"/>
+ RelativePath="..\..\include\wx\toplevel.h">
+ </File>
<File
- RelativePath="..\..\include\wx\treebase.h"/>
+ RelativePath="..\..\include\wx\treebase.h">
+ </File>
<File
- RelativePath="..\..\include\wx\treebook.h"/>
+ RelativePath="..\..\include\wx\treebook.h">
+ </File>
<File
- RelativePath="..\..\include\wx\treectrl.h"/>
+ RelativePath="..\..\include\wx\treectrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\valgen.h"/>
+ RelativePath="..\..\include\wx\valgen.h">
+ </File>
<File
- RelativePath="..\..\include\wx\validate.h"/>
+ RelativePath="..\..\include\wx\validate.h">
+ </File>
<File
- RelativePath="..\..\include\wx\valtext.h"/>
+ RelativePath="..\..\include\wx\valtext.h">
+ </File>
<File
- RelativePath="..\..\include\wx\vidmode.h"/>
+ RelativePath="..\..\include\wx\vidmode.h">
+ </File>
<File
- RelativePath="..\..\include\wx\vlbox.h"/>
+ RelativePath="..\..\include\wx\vlbox.h">
+ </File>
<File
- RelativePath="..\..\include\wx\vms_x_fix.h"/>
+ RelativePath="..\..\include\wx\vms_x_fix.h">
+ </File>
<File
- RelativePath="..\..\include\wx\vscroll.h"/>
+ RelativePath="..\..\include\wx\vscroll.h">
+ </File>
<File
- RelativePath="..\..\include\wx\window.h"/>
+ RelativePath="..\..\include\wx\window.h">
+ </File>
<File
- RelativePath="..\..\include\wx\windowid.h"/>
+ RelativePath="..\..\include\wx\windowid.h">
+ </File>
<File
- RelativePath="..\..\include\wx\wizard.h"/>
+ RelativePath="..\..\include\wx\wizard.h">
+ </File>
<File
- RelativePath="..\..\include\wx\wrapsizer.h"/>
+ RelativePath="..\..\include\wx\wrapsizer.h">
+ </File>
<File
- RelativePath="..\..\include\wx\wupdlock.h"/>
+ RelativePath="..\..\include\wx\wupdlock.h">
+ </File>
<File
- RelativePath="..\..\include\wx\wxhtml.h"/>
+ RelativePath="..\..\include\wx\wxhtml.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_all.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_all.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_animatctrl.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_animatctrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_bmp.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_bmp.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_bmpbt.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_bmpbt.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_bmpcbox.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_bmpcbox.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_bttn.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_bttn.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_cald.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_cald.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_chckb.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_chckb.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_chckl.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_chckl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_choic.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_choic.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_choicbk.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_choicbk.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_clrpicker.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_clrpicker.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_collpane.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_collpane.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_combo.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_combo.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_datectrl.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_datectrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_dirpicker.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_dirpicker.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_dlg.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_dlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_filepicker.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_filepicker.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_fontpicker.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_fontpicker.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_frame.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_frame.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_gauge.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_gauge.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_gdctl.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_gdctl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_grid.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_grid.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_html.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_html.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_htmllbox.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_htmllbox.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_hyperlink.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_hyperlink.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_listb.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_listb.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_listbk.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_listbk.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_listc.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_listc.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_mdi.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_mdi.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_menu.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_menu.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_notbk.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_notbk.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_odcombo.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_odcombo.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_panel.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_panel.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_propdlg.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_propdlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_radbt.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_radbt.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_radbx.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_radbx.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_scrol.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_scrol.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_scwin.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_scwin.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_sizer.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_sizer.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_slidr.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_slidr.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_spin.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_spin.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_split.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_split.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_srchctrl.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_srchctrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_statbar.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_statbar.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_stbmp.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_stbmp.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_stbox.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_stbox.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_stlin.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_stlin.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_sttxt.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_sttxt.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_text.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_text.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_tglbtn.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_toolb.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_toolb.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_tree.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_tree.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_treebk.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_treebk.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_unkwn.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_unkwn.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_wizrd.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_wizrd.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xmlres.h"/>
+ RelativePath="..\..\include\wx\xrc\xmlres.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xpmdecod.h"/>
+ RelativePath="..\..\include\wx\xpmdecod.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xpmhand.h"/>
+ RelativePath="..\..\include\wx\xpmhand.h">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc7_gl.vcproj b/build/msw/wx_vc7_gl.vcproj
index 66ee451ee3..e9c381623a 100644
--- a/build/msw/wx_vc7_gl.vcproj
+++ b/build/msw/wx_vc7_gl.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,32 +22,16 @@
IntermediateDirectory="vc_mswunivudll\gl"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivudll\wxprec_gldll.pch"
@@ -55,40 +39,46 @@
ObjectFile="vc_mswunivudll\gl\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_gl_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv29u_core.lib wxbase29u.lib opengl32.lib glu32.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv29u_core.lib wxbase29u.lib opengl32.lib glu32.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290u_gl_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_gl.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_gl_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_gl.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -96,32 +86,19 @@
IntermediateDirectory="vc_mswunivuddll\gl"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivuddll\wxprec_gldll.pch"
@@ -129,40 +106,46 @@
ObjectFile="vc_mswunivuddll\gl\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_gl_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 wxmswuniv29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 wxmswuniv29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_gl_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_gl.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_gl_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_gl.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -170,32 +153,16 @@
IntermediateDirectory="vc_mswudll\gl"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_gldll.pch"
@@ -203,40 +170,46 @@
ObjectFile="vc_mswudll\gl\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_gl_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw29u_core.lib wxbase29u.lib opengl32.lib glu32.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw29u_core.lib wxbase29u.lib opengl32.lib glu32.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290u_gl_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29u_gl.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_gl_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_gl.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -244,32 +217,19 @@
IntermediateDirectory="vc_mswuddll\gl"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_gldll.pch"
@@ -277,40 +237,46 @@
ObjectFile="vc_mswuddll\gl\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_gl_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 wxmsw29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 wxmsw29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290ud_gl_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_gl.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290ud_gl_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_gl.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -318,32 +284,16 @@
IntermediateDirectory="vc_mswunivu\gl"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivu\wxprec_gllib.pch"
@@ -351,32 +301,38 @@
ObjectFile="vc_mswunivu\gl\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_gl.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmswuniv29u_gl.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmswuniv29u_gl.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_gl.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -384,32 +340,19 @@
IntermediateDirectory="vc_mswunivud\gl"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivud\wxprec_gllib.pch"
@@ -417,32 +360,38 @@
ObjectFile="vc_mswunivud\gl\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_gl.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_gl.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_gl.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_gl.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -450,32 +399,16 @@
IntermediateDirectory="vc_mswu\gl"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswu\wxprec_gllib.pch"
@@ -483,32 +416,38 @@
ObjectFile="vc_mswu\gl\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_gl.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmsw29u_gl.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmsw29u_gl.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_gl.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -516,32 +455,19 @@
IntermediateDirectory="vc_mswud\gl"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswud\wxprec_gllib.pch"
@@ -549,32 +475,38 @@
ObjectFile="vc_mswud\gl\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_gl.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmsw29ud_gl.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmsw29ud_gl.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_gl.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -636,27 +568,29 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\common\glcmn.cpp"/>
+ RelativePath="..\..\src\common\glcmn.cpp">
+ </File>
</Filter>
<Filter
Name="MSW Sources"
UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}">
<File
- RelativePath="..\..\src\msw\glcanvas.cpp"/>
+ RelativePath="..\..\src\msw\glcanvas.cpp">
+ </File>
<File
RelativePath="..\..\src\msw\version.rc">
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
</Filter>
<Filter
@@ -836,13 +770,15 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\include\wx\msw\glcanvas.h"/>
+ RelativePath="..\..\include\wx\msw\glcanvas.h">
+ </File>
</Filter>
<Filter
Name="Common Headers"
UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}">
<File
- RelativePath="..\..\include\wx\glcanvas.h"/>
+ RelativePath="..\..\include\wx\glcanvas.h">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc7_html.vcproj b/build/msw/wx_vc7_html.vcproj
index 81a2320ff1..98c1b54607 100644
--- a/build/msw/wx_vc7_html.vcproj
+++ b/build/msw/wx_vc7_html.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,32 +22,16 @@
IntermediateDirectory="vc_mswunivudll\html"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivudll\wxprec_htmldll.pch"
@@ -55,40 +39,46 @@
ObjectFile="vc_mswunivudll\html\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_html_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290u_html_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_html.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_html_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_html.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -96,32 +86,19 @@
IntermediateDirectory="vc_mswunivuddll\html"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivuddll\wxprec_htmldll.pch"
@@ -129,40 +106,46 @@
ObjectFile="vc_mswunivuddll\html\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_html_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_html_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_html.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_html_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_html.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -170,32 +153,16 @@
IntermediateDirectory="vc_mswudll\html"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_htmldll.pch"
@@ -203,40 +170,46 @@
ObjectFile="vc_mswudll\html\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_html_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290u_html_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29u_html.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_html_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_html.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -244,32 +217,19 @@
IntermediateDirectory="vc_mswuddll\html"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_htmldll.pch"
@@ -277,40 +237,46 @@
ObjectFile="vc_mswuddll\html\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_html_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290ud_html_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_html.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290ud_html_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_html.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -318,32 +284,16 @@
IntermediateDirectory="vc_mswunivu\html"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivu\wxprec_htmllib.pch"
@@ -351,32 +301,38 @@
ObjectFile="vc_mswunivu\html\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_html.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmswuniv29u_html.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmswuniv29u_html.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_html.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -384,32 +340,19 @@
IntermediateDirectory="vc_mswunivud\html"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivud\wxprec_htmllib.pch"
@@ -417,32 +360,38 @@
ObjectFile="vc_mswunivud\html\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_html.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_html.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_html.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_html.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -450,32 +399,16 @@
IntermediateDirectory="vc_mswu\html"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswu\wxprec_htmllib.pch"
@@ -483,32 +416,38 @@
ObjectFile="vc_mswu\html\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_html.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmsw29u_html.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmsw29u_html.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_html.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -516,32 +455,19 @@
IntermediateDirectory="vc_mswud\html"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswud\wxprec_htmllib.pch"
@@ -549,32 +475,38 @@
ObjectFile="vc_mswud\html\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_html.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmsw29ud_html.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmsw29ud_html.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_html.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -640,76 +572,100 @@
Name="MSW Sources"
UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}">
<File
- RelativePath="..\..\src\msw\helpbest.cpp"/>
+ RelativePath="..\..\src\msw\helpbest.cpp">
+ </File>
<File
RelativePath="..\..\src\msw\version.rc">
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
</Filter>
<Filter
Name="Generic Sources"
UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}">
<File
- RelativePath="..\..\src\generic\htmllbox.cpp"/>
+ RelativePath="..\..\src\generic\htmllbox.cpp">
+ </File>
</Filter>
<Filter
Name="wxHTML Sources"
UniqueIdentifier="{2F6FA2A9-E2B7-5B50-9F90-38855A21AF00}">
<File
- RelativePath="..\..\src\html\helpctrl.cpp"/>
+ RelativePath="..\..\src\html\helpctrl.cpp">
+ </File>
<File
- RelativePath="..\..\src\html\helpdata.cpp"/>
+ RelativePath="..\..\src\html\helpdata.cpp">
+ </File>
<File
- RelativePath="..\..\src\html\helpdlg.cpp"/>
+ RelativePath="..\..\src\html\helpdlg.cpp">
+ </File>
<File
- RelativePath="..\..\src\html\helpfrm.cpp"/>
+ RelativePath="..\..\src\html\helpfrm.cpp">
+ </File>
<File
- RelativePath="..\..\src\html\helpwnd.cpp"/>
+ RelativePath="..\..\src\html\helpwnd.cpp">
+ </File>
<File
- RelativePath="..\..\src\html\htmlcell.cpp"/>
+ RelativePath="..\..\src\html\htmlcell.cpp">
+ </File>
<File
- RelativePath="..\..\src\html\htmlfilt.cpp"/>
+ RelativePath="..\..\src\html\htmlfilt.cpp">
+ </File>
<File
- RelativePath="..\..\src\html\htmlpars.cpp"/>
+ RelativePath="..\..\src\html\htmlpars.cpp">
+ </File>
<File
- RelativePath="..\..\src\html\htmltag.cpp"/>
+ RelativePath="..\..\src\html\htmltag.cpp">
+ </File>
<File
- RelativePath="..\..\src\html\htmlwin.cpp"/>
+ RelativePath="..\..\src\html\htmlwin.cpp">
+ </File>
<File
- RelativePath="..\..\src\html\htmprint.cpp"/>
+ RelativePath="..\..\src\html\htmprint.cpp">
+ </File>
<File
- RelativePath="..\..\src\html\m_dflist.cpp"/>
+ RelativePath="..\..\src\html\m_dflist.cpp">
+ </File>
<File
- RelativePath="..\..\src\html\m_fonts.cpp"/>
+ RelativePath="..\..\src\html\m_fonts.cpp">
+ </File>
<File
- RelativePath="..\..\src\html\m_hline.cpp"/>
+ RelativePath="..\..\src\html\m_hline.cpp">
+ </File>
<File
- RelativePath="..\..\src\html\m_image.cpp"/>
+ RelativePath="..\..\src\html\m_image.cpp">
+ </File>
<File
- RelativePath="..\..\src\html\m_layout.cpp"/>
+ RelativePath="..\..\src\html\m_layout.cpp">
+ </File>
<File
- RelativePath="..\..\src\html\m_links.cpp"/>
+ RelativePath="..\..\src\html\m_links.cpp">
+ </File>
<File
- RelativePath="..\..\src\html\m_list.cpp"/>
+ RelativePath="..\..\src\html\m_list.cpp">
+ </File>
<File
- RelativePath="..\..\src\html\m_pre.cpp"/>
+ RelativePath="..\..\src\html\m_pre.cpp">
+ </File>
<File
- RelativePath="..\..\src\html\m_style.cpp"/>
+ RelativePath="..\..\src\html\m_style.cpp">
+ </File>
<File
- RelativePath="..\..\src\html\m_tables.cpp"/>
+ RelativePath="..\..\src\html\m_tables.cpp">
+ </File>
<File
- RelativePath="..\..\src\html\winpars.cpp"/>
+ RelativePath="..\..\src\html\winpars.cpp">
+ </File>
</Filter>
<Filter
Name="Setup Headers"
@@ -888,49 +844,67 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\include\wx\msw\helpbest.h"/>
+ RelativePath="..\..\include\wx\msw\helpbest.h">
+ </File>
</Filter>
<Filter
Name="wxHTML Headers"
UniqueIdentifier="{B4103426-A5DB-5CF0-A30E-BC9546513AAF}">
<File
- RelativePath="..\..\include\wx\html\helpctrl.h"/>
+ RelativePath="..\..\include\wx\html\helpctrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\html\helpdata.h"/>
+ RelativePath="..\..\include\wx\html\helpdata.h">
+ </File>
<File
- RelativePath="..\..\include\wx\html\helpdlg.h"/>
+ RelativePath="..\..\include\wx\html\helpdlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\html\helpfrm.h"/>
+ RelativePath="..\..\include\wx\html\helpfrm.h">
+ </File>
<File
- RelativePath="..\..\include\wx\html\helpwnd.h"/>
+ RelativePath="..\..\include\wx\html\helpwnd.h">
+ </File>
<File
- RelativePath="..\..\include\wx\html\htmlcell.h"/>
+ RelativePath="..\..\include\wx\html\htmlcell.h">
+ </File>
<File
- RelativePath="..\..\include\wx\html\htmldefs.h"/>
+ RelativePath="..\..\include\wx\html\htmldefs.h">
+ </File>
<File
- RelativePath="..\..\include\wx\html\htmlfilt.h"/>
+ RelativePath="..\..\include\wx\html\htmlfilt.h">
+ </File>
<File
- RelativePath="..\..\include\wx\html\htmlpars.h"/>
+ RelativePath="..\..\include\wx\html\htmlpars.h">
+ </File>
<File
- RelativePath="..\..\include\wx\html\htmlproc.h"/>
+ RelativePath="..\..\include\wx\html\htmlproc.h">
+ </File>
<File
- RelativePath="..\..\include\wx\html\htmltag.h"/>
+ RelativePath="..\..\include\wx\html\htmltag.h">
+ </File>
<File
- RelativePath="..\..\include\wx\html\htmlwin.h"/>
+ RelativePath="..\..\include\wx\html\htmlwin.h">
+ </File>
<File
- RelativePath="..\..\include\wx\html\htmprint.h"/>
+ RelativePath="..\..\include\wx\html\htmprint.h">
+ </File>
<File
- RelativePath="..\..\include\wx\html\m_templ.h"/>
+ RelativePath="..\..\include\wx\html\m_templ.h">
+ </File>
<File
- RelativePath="..\..\include\wx\html\winpars.h"/>
+ RelativePath="..\..\include\wx\html\winpars.h">
+ </File>
</Filter>
<Filter
Name="Common Headers"
UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}">
<File
- RelativePath="..\..\include\wx\htmllbox.h"/>
+ RelativePath="..\..\include\wx\htmllbox.h">
+ </File>
<File
- RelativePath="..\..\include\wx\wxhtml.h"/>
+ RelativePath="..\..\include\wx\wxhtml.h">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc7_media.vcproj b/build/msw/wx_vc7_media.vcproj
index bb49547e9d..ee70d3b4bb 100644
--- a/build/msw/wx_vc7_media.vcproj
+++ b/build/msw/wx_vc7_media.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,32 +22,16 @@
IntermediateDirectory="vc_mswunivudll\media"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivudll\wxprec_mediadll.pch"
@@ -55,40 +39,46 @@
ObjectFile="vc_mswunivudll\media\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_media_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290u_media_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_media.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_media_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_media.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -96,32 +86,19 @@
IntermediateDirectory="vc_mswunivuddll\media"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivuddll\wxprec_mediadll.pch"
@@ -129,40 +106,46 @@
ObjectFile="vc_mswunivuddll\media\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_media_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_media_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_media.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_media_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_media.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -170,32 +153,16 @@
IntermediateDirectory="vc_mswudll\media"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_mediadll.pch"
@@ -203,40 +170,46 @@
ObjectFile="vc_mswudll\media\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_media_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290u_media_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29u_media.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_media_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_media.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -244,32 +217,19 @@
IntermediateDirectory="vc_mswuddll\media"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_mediadll.pch"
@@ -277,40 +237,46 @@
ObjectFile="vc_mswuddll\media\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_media_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290ud_media_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_media.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290ud_media_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_media.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -318,32 +284,16 @@
IntermediateDirectory="vc_mswunivu\media"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivu\wxprec_medialib.pch"
@@ -351,32 +301,38 @@
ObjectFile="vc_mswunivu\media\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_media.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmswuniv29u_media.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmswuniv29u_media.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_media.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -384,32 +340,19 @@
IntermediateDirectory="vc_mswunivud\media"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivud\wxprec_medialib.pch"
@@ -417,32 +360,38 @@
ObjectFile="vc_mswunivud\media\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_media.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_media.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_media.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_media.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -450,32 +399,16 @@
IntermediateDirectory="vc_mswu\media"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswu\wxprec_medialib.pch"
@@ -483,32 +416,38 @@
ObjectFile="vc_mswu\media\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_media.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmsw29u_media.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmsw29u_media.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_media.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -516,32 +455,19 @@
IntermediateDirectory="vc_mswud\media"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswud\wxprec_medialib.pch"
@@ -549,32 +475,38 @@
ObjectFile="vc_mswud\media\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_media.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmsw29ud_media.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmsw29ud_media.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_media.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -636,33 +568,38 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\common\mediactrlcmn.cpp"/>
+ RelativePath="..\..\src\common\mediactrlcmn.cpp">
+ </File>
</Filter>
<Filter
Name="MSW Sources"
UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}">
<File
- RelativePath="..\..\src\msw\ole\activex.cpp"/>
+ RelativePath="..\..\src\msw\ole\activex.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\mediactrl_am.cpp"/>
+ RelativePath="..\..\src\msw\mediactrl_am.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\mediactrl_qt.cpp"/>
+ RelativePath="..\..\src\msw\mediactrl_qt.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\mediactrl_wmp10.cpp"/>
+ RelativePath="..\..\src\msw\mediactrl_wmp10.cpp">
+ </File>
<File
RelativePath="..\..\src\msw\version.rc">
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
</Filter>
<Filter
@@ -767,7 +704,8 @@
Name="MSW Headers"
UniqueIdentifier="{5AFFF20E-29F9-512B-B80A-7DC45976CDAC}">
<File
- RelativePath="..\..\include\wx\msw\ole\activex.h"/>
+ RelativePath="..\..\include\wx\msw\ole\activex.h">
+ </File>
<File
RelativePath="..\..\include\wx\msw\genrcdefs.h">
<FileConfiguration
@@ -848,7 +786,8 @@
Name="Common Headers"
UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}">
<File
- RelativePath="..\..\include\wx\mediactrl.h"/>
+ RelativePath="..\..\include\wx\mediactrl.h">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc7_net.vcproj b/build/msw/wx_vc7_net.vcproj
index b5503bd132..0efcc5126c 100644
--- a/build/msw/wx_vc7_net.vcproj
+++ b/build/msw/wx_vc7_net.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,32 +22,16 @@
IntermediateDirectory="vc_mswunivudll\net"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivudll\wxprec_netdll.pch"
@@ -55,40 +39,46 @@
ObjectFile="vc_mswunivudll\net\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290u_net_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxbase290u_net_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase29u_net.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290u_net_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_net.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -96,32 +86,19 @@
IntermediateDirectory="vc_mswunivuddll\net"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivuddll\wxprec_netdll.pch"
@@ -129,40 +106,46 @@
ObjectFile="vc_mswunivuddll\net\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290ud_net_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxbase290ud_net_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase29ud_net.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290ud_net_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_net.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -170,32 +153,16 @@
IntermediateDirectory="vc_mswudll\net"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_netdll.pch"
@@ -203,40 +170,46 @@
ObjectFile="vc_mswudll\net\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290u_net_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxbase290u_net_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase29u_net.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290u_net_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_net.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -244,32 +217,19 @@
IntermediateDirectory="vc_mswuddll\net"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_netdll.pch"
@@ -277,40 +237,46 @@
ObjectFile="vc_mswuddll\net\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290ud_net_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxbase290ud_net_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase29ud_net.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290ud_net_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_net.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -318,32 +284,16 @@
IntermediateDirectory="vc_mswunivu\net"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivu\wxprec_netlib.pch"
@@ -351,32 +301,38 @@
ObjectFile="vc_mswunivu\net\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29u_net.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxbase29u_net.lib"
+ SuppressStartupBanner="TRUE"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxbase29u_net.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_net.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -384,32 +340,19 @@
IntermediateDirectory="vc_mswunivud\net"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivud\wxprec_netlib.pch"
@@ -417,32 +360,38 @@
ObjectFile="vc_mswunivud\net\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29ud_net.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxbase29ud_net.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxbase29ud_net.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_net.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -450,32 +399,16 @@
IntermediateDirectory="vc_mswu\net"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswu\wxprec_netlib.pch"
@@ -483,32 +416,38 @@
ObjectFile="vc_mswu\net\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29u_net.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxbase29u_net.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxbase29u_net.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_net.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -516,32 +455,19 @@
IntermediateDirectory="vc_mswud\net"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswud\wxprec_netlib.pch"
@@ -549,32 +475,38 @@
ObjectFile="vc_mswud\net\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29ud_net.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxbase29ud_net.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxbase29ud_net.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_net.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -636,49 +568,62 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\common\fs_inet.cpp"/>
+ RelativePath="..\..\src\common\fs_inet.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\ftp.cpp"/>
+ RelativePath="..\..\src\common\ftp.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\http.cpp"/>
+ RelativePath="..\..\src\common\http.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\protocol.cpp"/>
+ RelativePath="..\..\src\common\protocol.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\sckaddr.cpp"/>
+ RelativePath="..\..\src\common\sckaddr.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\sckfile.cpp"/>
+ RelativePath="..\..\src\common\sckfile.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\sckipc.cpp"/>
+ RelativePath="..\..\src\common\sckipc.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\sckstrm.cpp"/>
+ RelativePath="..\..\src\common\sckstrm.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\socket.cpp"/>
+ RelativePath="..\..\src\common\socket.cpp">
+ </File>
<File
- RelativePath="..\..\src\common\url.cpp"/>
+ RelativePath="..\..\src\common\url.cpp">
+ </File>
</Filter>
<Filter
Name="MSW Sources"
UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}">
<File
- RelativePath="..\..\src\msw\gsocket.cpp"/>
+ RelativePath="..\..\src\msw\gsocket.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\gsockmsw.cpp"/>
+ RelativePath="..\..\src\msw\gsockmsw.cpp">
+ </File>
<File
- RelativePath="..\..\src\msw\urlmsw.cpp"/>
+ RelativePath="..\..\src\msw\urlmsw.cpp">
+ </File>
<File
RelativePath="..\..\src\msw\version.rc">
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
</Filter>
<Filter
@@ -858,33 +803,45 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\include\wx\msw\gsockmsw.h"/>
+ RelativePath="..\..\include\wx\msw\gsockmsw.h">
+ </File>
</Filter>
<Filter
Name="Common Headers"
UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}">
<File
- RelativePath="..\..\include\wx\protocol\file.h"/>
+ RelativePath="..\..\include\wx\protocol\file.h">
+ </File>
<File
- RelativePath="..\..\include\wx\fs_inet.h"/>
+ RelativePath="..\..\include\wx\fs_inet.h">
+ </File>
<File
- RelativePath="..\..\include\wx\protocol\ftp.h"/>
+ RelativePath="..\..\include\wx\protocol\ftp.h">
+ </File>
<File
- RelativePath="..\..\include\wx\gsocket.h"/>
+ RelativePath="..\..\include\wx\gsocket.h">
+ </File>
<File
- RelativePath="..\..\include\wx\protocol\http.h"/>
+ RelativePath="..\..\include\wx\protocol\http.h">
+ </File>
<File
- RelativePath="..\..\include\wx\protocol\protocol.h"/>
+ RelativePath="..\..\include\wx\protocol\protocol.h">
+ </File>
<File
- RelativePath="..\..\include\wx\sckaddr.h"/>
+ RelativePath="..\..\include\wx\sckaddr.h">
+ </File>
<File
- RelativePath="..\..\include\wx\sckipc.h"/>
+ RelativePath="..\..\include\wx\sckipc.h">
+ </File>
<File
- RelativePath="..\..\include\wx\sckstrm.h"/>
+ RelativePath="..\..\include\wx\sckstrm.h">
+ </File>
<File
- RelativePath="..\..\include\wx\socket.h"/>
+ RelativePath="..\..\include\wx\socket.h">
+ </File>
<File
- RelativePath="..\..\include\wx\url.h"/>
+ RelativePath="..\..\include\wx\url.h">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc7_propgrid.vcproj b/build/msw/wx_vc7_propgrid.vcproj
index 68fb39acc7..27209111fc 100644
--- a/build/msw/wx_vc7_propgrid.vcproj
+++ b/build/msw/wx_vc7_propgrid.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,32 +22,16 @@
IntermediateDirectory="vc_mswunivudll\propgrid"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivudll\wxprec_propgriddll.pch"
@@ -55,40 +39,46 @@
ObjectFile="vc_mswunivudll\propgrid\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_propgrid_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290u_propgrid_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_propgrid.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_propgrid_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_propgrid.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -96,32 +86,19 @@
IntermediateDirectory="vc_mswunivuddll\propgrid"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivuddll\wxprec_propgriddll.pch"
@@ -129,40 +106,46 @@
ObjectFile="vc_mswunivuddll\propgrid\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_propgrid_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_propgrid_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_propgrid.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_propgrid_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_propgrid.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -170,32 +153,16 @@
IntermediateDirectory="vc_mswudll\propgrid"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_propgriddll.pch"
@@ -203,40 +170,46 @@
ObjectFile="vc_mswudll\propgrid\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_propgrid_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290u_propgrid_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29u_propgrid.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_propgrid_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_propgrid.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -244,32 +217,19 @@
IntermediateDirectory="vc_mswuddll\propgrid"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_propgriddll.pch"
@@ -277,40 +237,46 @@
ObjectFile="vc_mswuddll\propgrid\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_propgrid_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290ud_propgrid_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_propgrid.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290ud_propgrid_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_propgrid.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -318,32 +284,16 @@
IntermediateDirectory="vc_mswunivu\propgrid"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivu\wxprec_propgridlib.pch"
@@ -351,32 +301,38 @@
ObjectFile="vc_mswunivu\propgrid\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_propgrid.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmswuniv29u_propgrid.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmswuniv29u_propgrid.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_propgrid.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -384,32 +340,19 @@
IntermediateDirectory="vc_mswunivud\propgrid"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivud\wxprec_propgridlib.pch"
@@ -417,32 +360,38 @@
ObjectFile="vc_mswunivud\propgrid\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_propgrid.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_propgrid.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_propgrid.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_propgrid.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -450,32 +399,16 @@
IntermediateDirectory="vc_mswu\propgrid"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswu\wxprec_propgridlib.pch"
@@ -483,32 +416,38 @@
ObjectFile="vc_mswu\propgrid\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_propgrid.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmsw29u_propgrid.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmsw29u_propgrid.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_propgrid.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -516,32 +455,19 @@
IntermediateDirectory="vc_mswud\propgrid"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswud\wxprec_propgridlib.pch"
@@ -549,32 +475,38 @@
ObjectFile="vc_mswud\propgrid\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_propgrid.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmsw29ud_propgrid.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmsw29ud_propgrid.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_propgrid.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -643,16 +575,16 @@
RelativePath="..\..\src\msw\version.rc">
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
</Filter>
<Filter
@@ -836,44 +768,61 @@
Name="Common Headers"
UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}">
<File
- RelativePath="..\..\include\wx\propgrid\advprops.h"/>
+ RelativePath="..\..\include\wx\propgrid\advprops.h">
+ </File>
<File
- RelativePath="..\..\include\wx\propgrid\editors.h"/>
+ RelativePath="..\..\include\wx\propgrid\editors.h">
+ </File>
<File
- RelativePath="..\..\include\wx\propgrid\manager.h"/>
+ RelativePath="..\..\include\wx\propgrid\manager.h">
+ </File>
<File
- RelativePath="..\..\include\wx\propgrid\property.h"/>
+ RelativePath="..\..\include\wx\propgrid\property.h">
+ </File>
<File
- RelativePath="..\..\include\wx\propgrid\propgrid.h"/>
+ RelativePath="..\..\include\wx\propgrid\propgrid.h">
+ </File>
<File
- RelativePath="..\..\include\wx\propgrid\propgriddefs.h"/>
+ RelativePath="..\..\include\wx\propgrid\propgriddefs.h">
+ </File>
<File
- RelativePath="..\..\include\wx\propgrid\propgridiface.h"/>
+ RelativePath="..\..\include\wx\propgrid\propgridiface.h">
+ </File>
<File
- RelativePath="..\..\include\wx\propgrid\propgridpagestate.h"/>
+ RelativePath="..\..\include\wx\propgrid\propgridpagestate.h">
+ </File>
<File
- RelativePath="..\..\include\wx\propgrid\props.h"/>
+ RelativePath="..\..\include\wx\propgrid\props.h">
+ </File>
</Filter>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath="..\..\src\propgrid\advprops.cpp"/>
+ RelativePath="..\..\src\propgrid\advprops.cpp">
+ </File>
<File
- RelativePath="..\..\src\propgrid\editors.cpp"/>
+ RelativePath="..\..\src\propgrid\editors.cpp">
+ </File>
<File
- RelativePath="..\..\src\propgrid\manager.cpp"/>
+ RelativePath="..\..\src\propgrid\manager.cpp">
+ </File>
<File
- RelativePath="..\..\src\propgrid\property.cpp"/>
+ RelativePath="..\..\src\propgrid\property.cpp">
+ </File>
<File
- RelativePath="..\..\src\propgrid\propgrid.cpp"/>
+ RelativePath="..\..\src\propgrid\propgrid.cpp">
+ </File>
<File
- RelativePath="..\..\src\propgrid\propgridiface.cpp"/>
+ RelativePath="..\..\src\propgrid\propgridiface.cpp">
+ </File>
<File
- RelativePath="..\..\src\propgrid\propgridpagestate.cpp"/>
+ RelativePath="..\..\src\propgrid\propgridpagestate.cpp">
+ </File>
<File
- RelativePath="..\..\src\propgrid\props.cpp"/>
+ RelativePath="..\..\src\propgrid\props.cpp">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc7_qa.vcproj b/build/msw/wx_vc7_qa.vcproj
index dd690bed44..22e8211090 100644
--- a/build/msw/wx_vc7_qa.vcproj
+++ b/build/msw/wx_vc7_qa.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,32 +22,16 @@
IntermediateDirectory="vc_mswunivudll\qa"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivudll\wxprec_qadll.pch"
@@ -55,40 +39,46 @@
ObjectFile="vc_mswunivudll\qa\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_qa_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290u_qa_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_qa.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_qa_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_qa.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -96,32 +86,19 @@
IntermediateDirectory="vc_mswunivuddll\qa"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivuddll\wxprec_qadll.pch"
@@ -129,40 +106,46 @@
ObjectFile="vc_mswunivuddll\qa\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_qa_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_qa_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_qa.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_qa_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_qa.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -170,32 +153,16 @@
IntermediateDirectory="vc_mswudll\qa"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_qadll.pch"
@@ -203,40 +170,46 @@
ObjectFile="vc_mswudll\qa\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_qa_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290u_qa_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29u_qa.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_qa_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_qa.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -244,32 +217,19 @@
IntermediateDirectory="vc_mswuddll\qa"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_qadll.pch"
@@ -277,40 +237,46 @@
ObjectFile="vc_mswuddll\qa\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_qa_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290ud_qa_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_qa.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290ud_qa_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_qa.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -318,32 +284,16 @@
IntermediateDirectory="vc_mswunivu\qa"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivu\wxprec_qalib.pch"
@@ -351,32 +301,38 @@
ObjectFile="vc_mswunivu\qa\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_qa.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmswuniv29u_qa.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmswuniv29u_qa.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_qa.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -384,32 +340,19 @@
IntermediateDirectory="vc_mswunivud\qa"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivud\wxprec_qalib.pch"
@@ -417,32 +360,38 @@
ObjectFile="vc_mswunivud\qa\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_qa.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_qa.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_qa.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_qa.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -450,32 +399,16 @@
IntermediateDirectory="vc_mswu\qa"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswu\wxprec_qalib.pch"
@@ -483,32 +416,38 @@
ObjectFile="vc_mswu\qa\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_qa.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmsw29u_qa.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmsw29u_qa.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_qa.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -516,32 +455,19 @@
IntermediateDirectory="vc_mswud\qa"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswud\wxprec_qalib.pch"
@@ -549,32 +475,38 @@
ObjectFile="vc_mswud\qa\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_qa.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmsw29ud_qa.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmsw29ud_qa.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_qa.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -585,7 +517,8 @@
Name="Common Sources"
UniqueIdentifier="{A6A5C30D-BDB6-5050-906D-10A96065136C}">
<File
- RelativePath="..\..\src\common\debugrpt.cpp"/>
+ RelativePath="..\..\src\common\debugrpt.cpp">
+ </File>
<File
RelativePath="..\..\src\common\dummy.cpp">
<FileConfiguration
@@ -645,23 +578,24 @@
RelativePath="..\..\src\msw\version.rc">
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
</Filter>
<Filter
Name="Generic Sources"
UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}">
<File
- RelativePath="..\..\src\generic\dbgrptg.cpp"/>
+ RelativePath="..\..\src\generic\dbgrptg.cpp">
+ </File>
</Filter>
<Filter
Name="Setup Headers"
@@ -844,7 +778,8 @@
Name="Common Headers"
UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}">
<File
- RelativePath="..\..\include\wx\debugrpt.h"/>
+ RelativePath="..\..\include\wx\debugrpt.h">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc7_richtext.vcproj b/build/msw/wx_vc7_richtext.vcproj
index cfe3418632..260bcd93f7 100644
--- a/build/msw/wx_vc7_richtext.vcproj
+++ b/build/msw/wx_vc7_richtext.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,32 +22,16 @@
IntermediateDirectory="vc_mswunivudll\richtext"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivudll\wxprec_richtextdll.pch"
@@ -55,40 +39,46 @@
ObjectFile="vc_mswunivudll\richtext\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_richtext_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290u_richtext_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_richtext.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_richtext_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_richtext.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -96,32 +86,19 @@
IntermediateDirectory="vc_mswunivuddll\richtext"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivuddll\wxprec_richtextdll.pch"
@@ -129,40 +106,46 @@
ObjectFile="vc_mswunivuddll\richtext\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_richtext_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_richtext_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_richtext.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_richtext_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_richtext.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -170,32 +153,16 @@
IntermediateDirectory="vc_mswudll\richtext"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_richtextdll.pch"
@@ -203,40 +170,46 @@
ObjectFile="vc_mswudll\richtext\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_richtext_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290u_richtext_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29u_richtext.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_richtext_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_richtext.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -244,32 +217,19 @@
IntermediateDirectory="vc_mswuddll\richtext"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_richtextdll.pch"
@@ -277,40 +237,46 @@
ObjectFile="vc_mswuddll\richtext\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_richtext_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290ud_richtext_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_richtext.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290ud_richtext_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_richtext.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -318,32 +284,16 @@
IntermediateDirectory="vc_mswunivu\richtext"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivu\wxprec_richtextlib.pch"
@@ -351,32 +301,38 @@
ObjectFile="vc_mswunivu\richtext\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_richtext.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmswuniv29u_richtext.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmswuniv29u_richtext.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_richtext.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -384,32 +340,19 @@
IntermediateDirectory="vc_mswunivud\richtext"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivud\wxprec_richtextlib.pch"
@@ -417,32 +360,38 @@
ObjectFile="vc_mswunivud\richtext\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_richtext.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_richtext.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_richtext.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_richtext.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -450,32 +399,16 @@
IntermediateDirectory="vc_mswu\richtext"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswu\wxprec_richtextlib.pch"
@@ -483,32 +416,38 @@
ObjectFile="vc_mswu\richtext\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_richtext.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmsw29u_richtext.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmsw29u_richtext.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_richtext.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -516,32 +455,19 @@
IntermediateDirectory="vc_mswud\richtext"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswud\wxprec_richtextlib.pch"
@@ -549,32 +475,38 @@
ObjectFile="vc_mswud\richtext\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_richtext.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmsw29ud_richtext.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmsw29ud_richtext.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_richtext.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -643,16 +575,16 @@
RelativePath="..\..\src\msw\version.rc">
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
</Filter>
<Filter
@@ -836,46 +768,64 @@
Name="Common Headers"
UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}">
<File
- RelativePath="..\..\include\wx\richtext\richtextbuffer.h"/>
+ RelativePath="..\..\include\wx\richtext\richtextbuffer.h">
+ </File>
<File
- RelativePath="..\..\include\wx\richtext\richtextctrl.h"/>
+ RelativePath="..\..\include\wx\richtext\richtextctrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\richtext\richtextformatdlg.h"/>
+ RelativePath="..\..\include\wx\richtext\richtextformatdlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\richtext\richtexthtml.h"/>
+ RelativePath="..\..\include\wx\richtext\richtexthtml.h">
+ </File>
<File
- RelativePath="..\..\include\wx\richtext\richtextprint.h"/>
+ RelativePath="..\..\include\wx\richtext\richtextprint.h">
+ </File>
<File
- RelativePath="..\..\include\wx\richtext\richtextstyledlg.h"/>
+ RelativePath="..\..\include\wx\richtext\richtextstyledlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\richtext\richtextstyles.h"/>
+ RelativePath="..\..\include\wx\richtext\richtextstyles.h">
+ </File>
<File
- RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h"/>
+ RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\richtext\richtextxml.h"/>
+ RelativePath="..\..\include\wx\richtext\richtextxml.h">
+ </File>
</Filter>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath="..\..\src\richtext\richtextbuffer.cpp"/>
+ RelativePath="..\..\src\richtext\richtextbuffer.cpp">
+ </File>
<File
- RelativePath="..\..\src\richtext\richtextctrl.cpp"/>
+ RelativePath="..\..\src\richtext\richtextctrl.cpp">
+ </File>
<File
- RelativePath="..\..\src\richtext\richtextformatdlg.cpp"/>
+ RelativePath="..\..\src\richtext\richtextformatdlg.cpp">
+ </File>
<File
- RelativePath="..\..\src\richtext\richtexthtml.cpp"/>
+ RelativePath="..\..\src\richtext\richtexthtml.cpp">
+ </File>
<File
- RelativePath="..\..\src\richtext\richtextprint.cpp"/>
+ RelativePath="..\..\src\richtext\richtextprint.cpp">
+ </File>
<File
- RelativePath="..\..\src\richtext\richtextstyledlg.cpp"/>
+ RelativePath="..\..\src\richtext\richtextstyledlg.cpp">
+ </File>
<File
- RelativePath="..\..\src\richtext\richtextstyles.cpp"/>
+ RelativePath="..\..\src\richtext\richtextstyles.cpp">
+ </File>
<File
- RelativePath="..\..\src\richtext\richtextsymboldlg.cpp"/>
+ RelativePath="..\..\src\richtext\richtextsymboldlg.cpp">
+ </File>
<File
- RelativePath="..\..\src\richtext\richtextxml.cpp"/>
+ RelativePath="..\..\src\richtext\richtextxml.cpp">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc7_stc.vcproj b/build/msw/wx_vc7_stc.vcproj
index 060100786d..c09efcda5d 100644
--- a/build/msw/wx_vc7_stc.vcproj
+++ b/build/msw/wx_vc7_stc.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,32 +22,16 @@
IntermediateDirectory="vc_mswunivudll\stc"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivudll\wxprec_stcdll.pch"
@@ -55,40 +39,46 @@
ObjectFile="vc_mswunivudll\stc\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_stc_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290u_stc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_stc.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_stc_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_stc.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -96,32 +86,19 @@
IntermediateDirectory="vc_mswunivuddll\stc"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivuddll\wxprec_stcdll.pch"
@@ -129,40 +106,46 @@
ObjectFile="vc_mswunivuddll\stc\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_stc_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_stc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_stc.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_stc_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_stc.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -170,32 +153,16 @@
IntermediateDirectory="vc_mswudll\stc"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_stcdll.pch"
@@ -203,40 +170,46 @@
ObjectFile="vc_mswudll\stc\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_stc_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290u_stc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29u_stc.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_stc_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_stc.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -244,32 +217,19 @@
IntermediateDirectory="vc_mswuddll\stc"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_stcdll.pch"
@@ -277,40 +237,46 @@
ObjectFile="vc_mswuddll\stc\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_stc_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290ud_stc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_stc.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290ud_stc_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_stc.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -318,32 +284,16 @@
IntermediateDirectory="vc_mswunivu\stc"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivu\wxprec_stclib.pch"
@@ -351,32 +301,38 @@
ObjectFile="vc_mswunivu\stc\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_stc.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmswuniv29u_stc.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmswuniv29u_stc.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_stc.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -384,32 +340,19 @@
IntermediateDirectory="vc_mswunivud\stc"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivud\wxprec_stclib.pch"
@@ -417,32 +360,38 @@
ObjectFile="vc_mswunivud\stc\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_stc.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_stc.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_stc.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_stc.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -450,32 +399,16 @@
IntermediateDirectory="vc_mswu\stc"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswu\wxprec_stclib.pch"
@@ -483,32 +416,38 @@
ObjectFile="vc_mswu\stc\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_stc.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmsw29u_stc.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmsw29u_stc.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_stc.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -516,32 +455,19 @@
IntermediateDirectory="vc_mswud\stc"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswud\wxprec_stclib.pch"
@@ -549,32 +475,38 @@
ObjectFile="vc_mswud\stc\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_stc.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmsw29ud_stc.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmsw29ud_stc.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_stc.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -643,16 +575,16 @@
RelativePath="..\..\src\msw\version.rc">
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
</Filter>
<Filter
@@ -836,18 +768,22 @@
Name="Common Headers"
UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}">
<File
- RelativePath="..\..\include\wx\stc\stc.h"/>
+ RelativePath="..\..\include\wx\stc\stc.h">
+ </File>
</Filter>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath="..\..\src\stc\PlatWX.cpp"/>
+ RelativePath="..\..\src\stc\PlatWX.cpp">
+ </File>
<File
- RelativePath="..\..\src\stc\ScintillaWX.cpp"/>
+ RelativePath="..\..\src\stc\ScintillaWX.cpp">
+ </File>
<File
- RelativePath="..\..\src\stc\stc.cpp"/>
+ RelativePath="..\..\src\stc\stc.cpp">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc7_wxexpat.vcproj b/build/msw/wx_vc7_wxexpat.vcproj
index b1381ac955..796565a33f 100644
--- a/build/msw/wx_vc7_wxexpat.vcproj
+++ b/build/msw/wx_vc7_wxexpat.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,61 +22,51 @@
IntermediateDirectory="vc_mswunivudll\wxexpat"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;COMPILED_FROM_DSP"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\wxexpat\"
ObjectFile="vc_mswunivudll\wxexpat\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxexpat.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll"
- PreprocessorDefinitions="COMPILED_FROM_DSP"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_dll\wxexpat.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_dll\wxexpat.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="COMPILED_FROM_DSP"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_wxexpat.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -84,61 +74,54 @@
IntermediateDirectory="vc_mswunivuddll\wxexpat"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;COMPILED_FROM_DSP"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\wxexpat\"
ObjectFile="vc_mswunivuddll\wxexpat\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxexpatd.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll"
- PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_dll\wxexpatd.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_dll\wxexpatd.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_wxexpat.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -146,61 +129,51 @@
IntermediateDirectory="vc_mswudll\wxexpat"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;COMPILED_FROM_DSP"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\wxexpat\"
ObjectFile="vc_mswudll\wxexpat\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxexpat.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll"
- PreprocessorDefinitions="COMPILED_FROM_DSP"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_dll\wxexpat.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_dll\wxexpat.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="COMPILED_FROM_DSP"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_wxexpat.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -208,61 +181,54 @@
IntermediateDirectory="vc_mswuddll\wxexpat"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;COMPILED_FROM_DSP"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\wxexpat\"
ObjectFile="vc_mswuddll\wxexpat\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxexpatd.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll"
- PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_dll\wxexpatd.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_dll\wxexpatd.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_wxexpat.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -270,61 +236,51 @@
IntermediateDirectory="vc_mswunivu\wxexpat"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;COMPILED_FROM_DSP"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\wxexpat\"
ObjectFile="vc_mswunivu\wxexpat\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxexpat.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib"
- PreprocessorDefinitions="COMPILED_FROM_DSP"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxexpat.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxexpat.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="COMPILED_FROM_DSP"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_wxexpat.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -332,61 +288,54 @@
IntermediateDirectory="vc_mswunivud\wxexpat"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;COMPILED_FROM_DSP"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\wxexpat\"
ObjectFile="vc_mswunivud\wxexpat\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxexpatd.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib"
- PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxexpatd.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxexpatd.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_wxexpat.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -394,61 +343,51 @@
IntermediateDirectory="vc_mswu\wxexpat"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;COMPILED_FROM_DSP"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\wxexpat\"
ObjectFile="vc_mswu\wxexpat\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxexpat.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib"
- PreprocessorDefinitions="COMPILED_FROM_DSP"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxexpat.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxexpat.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="COMPILED_FROM_DSP"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_wxexpat.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -456,61 +395,54 @@
IntermediateDirectory="vc_mswud\wxexpat"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;COMPILED_FROM_DSP"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\wxexpat\"
ObjectFile="vc_mswud\wxexpat\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxexpatd.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib"
- PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxexpatd.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxexpatd.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_wxexpat.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -519,14 +451,17 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath="..\..\src\expat\lib\xmlparse.c"/>
+ RelativePath="..\..\src\expat\lib\xmlparse.c">
+ </File>
<File
- RelativePath="..\..\src\expat\lib\xmlrole.c"/>
+ RelativePath="..\..\src\expat\lib\xmlrole.c">
+ </File>
<File
- RelativePath="..\..\src\expat\lib\xmltok.c"/>
+ RelativePath="..\..\src\expat\lib\xmltok.c">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc7_wxjpeg.vcproj b/build/msw/wx_vc7_wxjpeg.vcproj
index a06f944ef3..7b7c532cf2 100644
--- a/build/msw/wx_vc7_wxjpeg.vcproj
+++ b/build/msw/wx_vc7_wxjpeg.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,61 +22,51 @@
IntermediateDirectory="vc_mswunivudll\wxjpeg"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\wxjpeg\"
ObjectFile="vc_mswunivudll\wxjpeg\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpeg.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"
- PreprocessorDefinitions=""/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_dll\wxjpeg.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_dll\wxjpeg.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_wxjpeg.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -84,61 +74,54 @@
IntermediateDirectory="vc_mswunivuddll\wxjpeg"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\wxjpeg\"
ObjectFile="vc_mswunivuddll\wxjpeg\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpegd.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"
- PreprocessorDefinitions="_DEBUG"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_dll\wxjpegd.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_dll\wxjpegd.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_wxjpeg.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -146,61 +129,51 @@
IntermediateDirectory="vc_mswudll\wxjpeg"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\wxjpeg\"
ObjectFile="vc_mswudll\wxjpeg\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpeg.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"
- PreprocessorDefinitions=""/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_dll\wxjpeg.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_dll\wxjpeg.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_wxjpeg.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -208,61 +181,54 @@
IntermediateDirectory="vc_mswuddll\wxjpeg"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\wxjpeg\"
ObjectFile="vc_mswuddll\wxjpeg\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpegd.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"
- PreprocessorDefinitions="_DEBUG"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_dll\wxjpegd.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_dll\wxjpegd.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_wxjpeg.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -270,61 +236,51 @@
IntermediateDirectory="vc_mswunivu\wxjpeg"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\wxjpeg\"
ObjectFile="vc_mswunivu\wxjpeg\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpeg.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"
- PreprocessorDefinitions=""/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxjpeg.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxjpeg.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_wxjpeg.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -332,61 +288,54 @@
IntermediateDirectory="vc_mswunivud\wxjpeg"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\wxjpeg\"
ObjectFile="vc_mswunivud\wxjpeg\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpegd.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"
- PreprocessorDefinitions="_DEBUG"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxjpegd.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxjpegd.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_wxjpeg.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -394,61 +343,51 @@
IntermediateDirectory="vc_mswu\wxjpeg"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\wxjpeg\"
ObjectFile="vc_mswu\wxjpeg\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpeg.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"
- PreprocessorDefinitions=""/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxjpeg.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxjpeg.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_wxjpeg.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -456,61 +395,54 @@
IntermediateDirectory="vc_mswud\wxjpeg"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\wxjpeg\"
ObjectFile="vc_mswud\wxjpeg\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpegd.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"
- PreprocessorDefinitions="_DEBUG"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxjpegd.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxjpegd.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_wxjpeg.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -519,100 +451,146 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath="..\..\src\jpeg\jcapimin.c"/>
+ RelativePath="..\..\src\jpeg\jcapimin.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jcapistd.c"/>
+ RelativePath="..\..\src\jpeg\jcapistd.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jccoefct.c"/>
+ RelativePath="..\..\src\jpeg\jccoefct.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jccolor.c"/>
+ RelativePath="..\..\src\jpeg\jccolor.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jcdctmgr.c"/>
+ RelativePath="..\..\src\jpeg\jcdctmgr.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jchuff.c"/>
+ RelativePath="..\..\src\jpeg\jchuff.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jcinit.c"/>
+ RelativePath="..\..\src\jpeg\jcinit.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jcmainct.c"/>
+ RelativePath="..\..\src\jpeg\jcmainct.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jcmarker.c"/>
+ RelativePath="..\..\src\jpeg\jcmarker.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jcmaster.c"/>
+ RelativePath="..\..\src\jpeg\jcmaster.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jcomapi.c"/>
+ RelativePath="..\..\src\jpeg\jcomapi.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jcparam.c"/>
+ RelativePath="..\..\src\jpeg\jcparam.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jcphuff.c"/>
+ RelativePath="..\..\src\jpeg\jcphuff.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jcprepct.c"/>
+ RelativePath="..\..\src\jpeg\jcprepct.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jcsample.c"/>
+ RelativePath="..\..\src\jpeg\jcsample.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jctrans.c"/>
+ RelativePath="..\..\src\jpeg\jctrans.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jdapimin.c"/>
+ RelativePath="..\..\src\jpeg\jdapimin.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jdapistd.c"/>
+ RelativePath="..\..\src\jpeg\jdapistd.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jdatadst.c"/>
+ RelativePath="..\..\src\jpeg\jdatadst.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jdatasrc.c"/>
+ RelativePath="..\..\src\jpeg\jdatasrc.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jdcoefct.c"/>
+ RelativePath="..\..\src\jpeg\jdcoefct.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jdcolor.c"/>
+ RelativePath="..\..\src\jpeg\jdcolor.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jddctmgr.c"/>
+ RelativePath="..\..\src\jpeg\jddctmgr.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jdhuff.c"/>
+ RelativePath="..\..\src\jpeg\jdhuff.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jdinput.c"/>
+ RelativePath="..\..\src\jpeg\jdinput.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jdmainct.c"/>
+ RelativePath="..\..\src\jpeg\jdmainct.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jdmarker.c"/>
+ RelativePath="..\..\src\jpeg\jdmarker.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jdmaster.c"/>
+ RelativePath="..\..\src\jpeg\jdmaster.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jdmerge.c"/>
+ RelativePath="..\..\src\jpeg\jdmerge.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jdphuff.c"/>
+ RelativePath="..\..\src\jpeg\jdphuff.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jdpostct.c"/>
+ RelativePath="..\..\src\jpeg\jdpostct.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jdsample.c"/>
+ RelativePath="..\..\src\jpeg\jdsample.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jdtrans.c"/>
+ RelativePath="..\..\src\jpeg\jdtrans.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jerror.c"/>
+ RelativePath="..\..\src\jpeg\jerror.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jfdctflt.c"/>
+ RelativePath="..\..\src\jpeg\jfdctflt.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jfdctfst.c"/>
+ RelativePath="..\..\src\jpeg\jfdctfst.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jfdctint.c"/>
+ RelativePath="..\..\src\jpeg\jfdctint.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jidctflt.c"/>
+ RelativePath="..\..\src\jpeg\jidctflt.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jidctfst.c"/>
+ RelativePath="..\..\src\jpeg\jidctfst.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jidctint.c"/>
+ RelativePath="..\..\src\jpeg\jidctint.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jidctred.c"/>
+ RelativePath="..\..\src\jpeg\jidctred.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jmemmgr.c"/>
+ RelativePath="..\..\src\jpeg\jmemmgr.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jmemnobs.c"/>
+ RelativePath="..\..\src\jpeg\jmemnobs.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jquant1.c"/>
+ RelativePath="..\..\src\jpeg\jquant1.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jquant2.c"/>
+ RelativePath="..\..\src\jpeg\jquant2.c">
+ </File>
<File
- RelativePath="..\..\src\jpeg\jutils.c"/>
+ RelativePath="..\..\src\jpeg\jutils.c">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc7_wxpng.vcproj b/build/msw/wx_vc7_wxpng.vcproj
index 70a4b05674..fa083cdba4 100644
--- a/build/msw/wx_vc7_wxpng.vcproj
+++ b/build/msw/wx_vc7_wxpng.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,61 +22,51 @@
IntermediateDirectory="vc_mswunivudll\wxpng"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\zlib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\wxpng\"
ObjectFile="vc_mswunivudll\wxpng\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxpng.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\src\zlib"
- PreprocessorDefinitions=""/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_dll\wxpng.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_dll\wxpng.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\src\zlib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_wxpng.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -84,61 +74,54 @@
IntermediateDirectory="vc_mswunivuddll\wxpng"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\zlib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\wxpng\"
ObjectFile="vc_mswunivuddll\wxpng\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxpngd.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\src\zlib"
- PreprocessorDefinitions="_DEBUG"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_dll\wxpngd.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_dll\wxpngd.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\src\zlib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_wxpng.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -146,61 +129,51 @@
IntermediateDirectory="vc_mswudll\wxpng"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\zlib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\wxpng\"
ObjectFile="vc_mswudll\wxpng\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxpng.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\src\zlib"
- PreprocessorDefinitions=""/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_dll\wxpng.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_dll\wxpng.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\src\zlib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_wxpng.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -208,61 +181,54 @@
IntermediateDirectory="vc_mswuddll\wxpng"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\zlib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\wxpng\"
ObjectFile="vc_mswuddll\wxpng\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxpngd.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\src\zlib"
- PreprocessorDefinitions="_DEBUG"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_dll\wxpngd.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_dll\wxpngd.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\src\zlib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_wxpng.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -270,61 +236,51 @@
IntermediateDirectory="vc_mswunivu\wxpng"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\zlib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\wxpng\"
ObjectFile="vc_mswunivu\wxpng\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxpng.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\src\zlib"
- PreprocessorDefinitions=""/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxpng.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxpng.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\src\zlib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_wxpng.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -332,61 +288,54 @@
IntermediateDirectory="vc_mswunivud\wxpng"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\zlib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\wxpng\"
ObjectFile="vc_mswunivud\wxpng\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxpngd.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\src\zlib"
- PreprocessorDefinitions="_DEBUG"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxpngd.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxpngd.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\src\zlib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_wxpng.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -394,61 +343,51 @@
IntermediateDirectory="vc_mswu\wxpng"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\zlib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\wxpng\"
ObjectFile="vc_mswu\wxpng\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxpng.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\src\zlib"
- PreprocessorDefinitions=""/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxpng.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxpng.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\src\zlib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_wxpng.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -456,61 +395,54 @@
IntermediateDirectory="vc_mswud\wxpng"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\zlib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\wxpng\"
ObjectFile="vc_mswud\wxpng\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxpngd.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\src\zlib"
- PreprocessorDefinitions="_DEBUG"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxpngd.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxpngd.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\src\zlib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_wxpng.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -519,42 +451,59 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath="..\..\src\png\png.c"/>
+ RelativePath="..\..\src\png\png.c">
+ </File>
<File
- RelativePath="..\..\src\png\pngerror.c"/>
+ RelativePath="..\..\src\png\pngerror.c">
+ </File>
<File
- RelativePath="..\..\src\png\pnggccrd.c"/>
+ RelativePath="..\..\src\png\pnggccrd.c">
+ </File>
<File
- RelativePath="..\..\src\png\pngget.c"/>
+ RelativePath="..\..\src\png\pngget.c">
+ </File>
<File
- RelativePath="..\..\src\png\pngmem.c"/>
+ RelativePath="..\..\src\png\pngmem.c">
+ </File>
<File
- RelativePath="..\..\src\png\pngpread.c"/>
+ RelativePath="..\..\src\png\pngpread.c">
+ </File>
<File
- RelativePath="..\..\src\png\pngread.c"/>
+ RelativePath="..\..\src\png\pngread.c">
+ </File>
<File
- RelativePath="..\..\src\png\pngrio.c"/>
+ RelativePath="..\..\src\png\pngrio.c">
+ </File>
<File
- RelativePath="..\..\src\png\pngrtran.c"/>
+ RelativePath="..\..\src\png\pngrtran.c">
+ </File>
<File
- RelativePath="..\..\src\png\pngrutil.c"/>
+ RelativePath="..\..\src\png\pngrutil.c">
+ </File>
<File
- RelativePath="..\..\src\png\pngset.c"/>
+ RelativePath="..\..\src\png\pngset.c">
+ </File>
<File
- RelativePath="..\..\src\png\pngtrans.c"/>
+ RelativePath="..\..\src\png\pngtrans.c">
+ </File>
<File
- RelativePath="..\..\src\png\pngvcrd.c"/>
+ RelativePath="..\..\src\png\pngvcrd.c">
+ </File>
<File
- RelativePath="..\..\src\png\pngwio.c"/>
+ RelativePath="..\..\src\png\pngwio.c">
+ </File>
<File
- RelativePath="..\..\src\png\pngwrite.c"/>
+ RelativePath="..\..\src\png\pngwrite.c">
+ </File>
<File
- RelativePath="..\..\src\png\pngwtran.c"/>
+ RelativePath="..\..\src\png\pngwtran.c">
+ </File>
<File
- RelativePath="..\..\src\png\pngwutil.c"/>
+ RelativePath="..\..\src\png\pngwutil.c">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc7_wxregex.vcproj b/build/msw/wx_vc7_wxregex.vcproj
index 898a82250f..d4cf48d429 100644
--- a/build/msw/wx_vc7_wxregex.vcproj
+++ b/build/msw/wx_vc7_wxregex.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,62 +22,52 @@
IntermediateDirectory="vc_mswunivudll\wxregex"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\wxregex\"
ObjectFile="vc_mswunivudll\wxregex\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxregexu.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_dll\wxregexu.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_dll\wxregexu.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_wxregex.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -85,62 +75,55 @@
IntermediateDirectory="vc_mswunivuddll\wxregex"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\wxregex\"
ObjectFile="vc_mswunivuddll\wxregex\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxregexud.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_dll\wxregexud.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_dll\wxregexud.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_wxregex.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -148,62 +131,52 @@
IntermediateDirectory="vc_mswudll\wxregex"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\wxregex\"
ObjectFile="vc_mswudll\wxregex\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxregexu.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"
- PreprocessorDefinitions="__WXMSW__;_UNICODE"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_dll\wxregexu.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_dll\wxregexu.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_wxregex.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -211,62 +184,55 @@
IntermediateDirectory="vc_mswuddll\wxregex"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;_UNICODE"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\wxregex\"
ObjectFile="vc_mswuddll\wxregex\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxregexud.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_dll\wxregexud.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_dll\wxregexud.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_wxregex.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -274,62 +240,52 @@
IntermediateDirectory="vc_mswunivu\wxregex"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\wxregex\"
ObjectFile="vc_mswunivu\wxregex\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxregexu.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxregexu.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxregexu.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_wxregex.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -337,62 +293,55 @@
IntermediateDirectory="vc_mswunivud\wxregex"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\wxregex\"
ObjectFile="vc_mswunivud\wxregex\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxregexud.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxregexud.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxregexud.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_wxregex.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -400,62 +349,52 @@
IntermediateDirectory="vc_mswu\wxregex"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\wxregex\"
ObjectFile="vc_mswu\wxregex\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxregexu.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"
- PreprocessorDefinitions="__WXMSW__;_UNICODE"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxregexu.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxregexu.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_wxregex.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -463,62 +402,55 @@
IntermediateDirectory="vc_mswud\wxregex"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;_UNICODE"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\wxregex\"
ObjectFile="vc_mswud\wxregex\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxregexud.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxregexud.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxregexud.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_wxregex.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -527,21 +459,25 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath="..\..\src\regex\regcomp.c"/>
+ RelativePath="..\..\src\regex\regcomp.c">
+ </File>
<File
- RelativePath="..\..\src\regex\regerror.c"/>
+ RelativePath="..\..\src\regex\regerror.c">
+ </File>
<File
- RelativePath="..\..\src\regex\regexec.c"/>
+ RelativePath="..\..\src\regex\regexec.c">
+ </File>
<File
- RelativePath="..\..\src\regex\regfree.c"/>
+ RelativePath="..\..\src\regex\regfree.c">
+ </File>
</Filter>
<Filter
Name="Header Files"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- Filter="h;hpp;hxx;hm;inl;inc;xsd">
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
<File
RelativePath="..\..\include\wx\msw\genrcdefs.h">
<FileConfiguration
diff --git a/build/msw/wx_vc7_wxscintilla.vcproj b/build/msw/wx_vc7_wxscintilla.vcproj
index 00b19b5ffd..55fafaf393 100644
--- a/build/msw/wx_vc7_wxscintilla.vcproj
+++ b/build/msw/wx_vc7_wxscintilla.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,61 +22,51 @@
IntermediateDirectory="vc_mswunivudll\wxscintilla"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WX__;SCI_LEXER;LINK_LEXERS"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\wxscintilla\"
ObjectFile="vc_mswunivudll\wxscintilla\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintilla.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_dll\wxscintilla.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_dll\wxscintilla.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_wxscintilla.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -84,61 +74,54 @@
IntermediateDirectory="vc_mswunivuddll\wxscintilla"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\wxscintilla\"
ObjectFile="vc_mswunivuddll\wxscintilla\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintillad.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_dll\wxscintillad.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_dll\wxscintillad.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_wxscintilla.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -146,61 +129,51 @@
IntermediateDirectory="vc_mswudll\wxscintilla"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WX__;SCI_LEXER;LINK_LEXERS"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\wxscintilla\"
ObjectFile="vc_mswudll\wxscintilla\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintilla.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_dll\wxscintilla.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_dll\wxscintilla.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_wxscintilla.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -208,61 +181,54 @@
IntermediateDirectory="vc_mswuddll\wxscintilla"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\wxscintilla\"
ObjectFile="vc_mswuddll\wxscintilla\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintillad.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_dll\wxscintillad.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_dll\wxscintillad.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_wxscintilla.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -270,61 +236,51 @@
IntermediateDirectory="vc_mswunivu\wxscintilla"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WX__;SCI_LEXER;LINK_LEXERS"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\wxscintilla\"
ObjectFile="vc_mswunivu\wxscintilla\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintilla.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxscintilla.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxscintilla.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_wxscintilla.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -332,61 +288,54 @@
IntermediateDirectory="vc_mswunivud\wxscintilla"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\wxscintilla\"
ObjectFile="vc_mswunivud\wxscintilla\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintillad.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxscintillad.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxscintillad.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_wxscintilla.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -394,61 +343,51 @@
IntermediateDirectory="vc_mswu\wxscintilla"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WX__;SCI_LEXER;LINK_LEXERS"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\wxscintilla\"
ObjectFile="vc_mswu\wxscintilla\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintilla.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxscintilla.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxscintilla.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_wxscintilla.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -456,61 +395,54 @@
IntermediateDirectory="vc_mswud\wxscintilla"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\wxscintilla\"
ObjectFile="vc_mswud\wxscintilla\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintillad.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxscintillad.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxscintillad.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_wxscintilla.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -519,192 +451,284 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath="..\..\src\stc\scintilla\src\AutoComplete.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\AutoComplete.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\CallTip.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\CallTip.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\CellBuffer.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\CellBuffer.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\CharClassify.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\CharClassify.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\ContractionState.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\ContractionState.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\Decoration.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\Decoration.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\Document.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\Document.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\DocumentAccessor.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\DocumentAccessor.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\Editor.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\Editor.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\ExternalLexer.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\ExternalLexer.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\Indicator.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\Indicator.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\KeyMap.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\KeyMap.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\KeyWords.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\KeyWords.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexAPDL.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexAPDL.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexASY.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexASY.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexAU3.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexAU3.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexAVE.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexAVE.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexAbaqus.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexAbaqus.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexAda.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexAda.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexAsm.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexAsm.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexAsn1.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexAsn1.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexBaan.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexBaan.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexBash.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexBash.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexBasic.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexBasic.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexBullant.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexBullant.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexCLW.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexCLW.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexCPP.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexCPP.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexCSS.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexCSS.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexCaml.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexCaml.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexCmake.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexCmake.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexConf.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexConf.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexCrontab.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexCrontab.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexCsound.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexCsound.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexD.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexD.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexEScript.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexEScript.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexEiffel.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexEiffel.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexErlang.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexErlang.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexFlagship.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexFlagship.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexForth.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexForth.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexFortran.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexFortran.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexGAP.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexGAP.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexGui4Cli.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexGui4Cli.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexHTML.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexHTML.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexHaskell.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexHaskell.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexInno.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexInno.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexKix.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexKix.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexLisp.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexLisp.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexLout.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexLout.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexLua.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexLua.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexMMIXAL.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexMMIXAL.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexMPT.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexMPT.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexMSSQL.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexMSSQL.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexMatlab.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexMatlab.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexMetapost.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexMetapost.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexNsis.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexNsis.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexOpal.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexOpal.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexOthers.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexOthers.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexPB.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexPB.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexPLM.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexPLM.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexPOV.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexPOV.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexPS.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexPS.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexPascal.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexPascal.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexPerl.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexPerl.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexProgress.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexProgress.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexPython.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexPython.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexR.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexR.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexRebol.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexRebol.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexRuby.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexRuby.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexSQL.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexSQL.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexScriptol.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexScriptol.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexSmalltalk.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexSmalltalk.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexSpecman.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexSpecman.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexSpice.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexSpice.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexTADS3.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexTADS3.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexTCL.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexTCL.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexTeX.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexTeX.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexVB.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexVB.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexVHDL.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexVHDL.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexVerilog.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexVerilog.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LexYAML.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LexYAML.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\LineMarker.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\LineMarker.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\PositionCache.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\PositionCache.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\PropSet.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\PropSet.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\RESearch.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\RESearch.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\RunStyles.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\RunStyles.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\ScintillaBase.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\ScintillaBase.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\Style.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\Style.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\StyleContext.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\StyleContext.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\UniConversion.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\UniConversion.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\ViewStyle.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\ViewStyle.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\WindowAccessor.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\WindowAccessor.cxx">
+ </File>
<File
- RelativePath="..\..\src\stc\scintilla\src\XPM.cxx"/>
+ RelativePath="..\..\src\stc\scintilla\src\XPM.cxx">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc7_wxtiff.vcproj b/build/msw/wx_vc7_wxtiff.vcproj
index 53c4852e99..49ac1fe387 100644
--- a/build/msw/wx_vc7_wxtiff.vcproj
+++ b/build/msw/wx_vc7_wxtiff.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,61 +22,51 @@
IntermediateDirectory="vc_mswunivudll\wxtiff"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\wxtiff\"
ObjectFile="vc_mswunivudll\wxtiff\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxtiff.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
- PreprocessorDefinitions=""/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_dll\wxtiff.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_dll\wxtiff.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_wxtiff.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -84,61 +74,54 @@
IntermediateDirectory="vc_mswunivuddll\wxtiff"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\wxtiff\"
ObjectFile="vc_mswunivuddll\wxtiff\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxtiffd.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
- PreprocessorDefinitions="_DEBUG"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_dll\wxtiffd.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_dll\wxtiffd.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_wxtiff.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -146,61 +129,51 @@
IntermediateDirectory="vc_mswudll\wxtiff"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\wxtiff\"
ObjectFile="vc_mswudll\wxtiff\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxtiff.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
- PreprocessorDefinitions=""/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_dll\wxtiff.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_dll\wxtiff.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_wxtiff.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -208,61 +181,54 @@
IntermediateDirectory="vc_mswuddll\wxtiff"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\wxtiff\"
ObjectFile="vc_mswuddll\wxtiff\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxtiffd.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
- PreprocessorDefinitions="_DEBUG"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_dll\wxtiffd.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_dll\wxtiffd.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_wxtiff.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -270,61 +236,51 @@
IntermediateDirectory="vc_mswunivu\wxtiff"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\wxtiff\"
ObjectFile="vc_mswunivu\wxtiff\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxtiff.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
- PreprocessorDefinitions=""/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxtiff.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxtiff.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_wxtiff.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -332,61 +288,54 @@
IntermediateDirectory="vc_mswunivud\wxtiff"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\wxtiff\"
ObjectFile="vc_mswunivud\wxtiff\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxtiffd.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
- PreprocessorDefinitions="_DEBUG"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxtiffd.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxtiffd.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_wxtiff.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -394,61 +343,51 @@
IntermediateDirectory="vc_mswu\wxtiff"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\wxtiff\"
ObjectFile="vc_mswu\wxtiff\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxtiff.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
- PreprocessorDefinitions=""/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxtiff.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxtiff.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_wxtiff.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -456,61 +395,54 @@
IntermediateDirectory="vc_mswud\wxtiff"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\wxtiff\"
ObjectFile="vc_mswud\wxtiff\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxtiffd.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
- PreprocessorDefinitions="_DEBUG"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxtiffd.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxtiffd.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_wxtiff.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -519,80 +451,116 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath="..\..\src\tiff\libtiff\tif_aux.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_aux.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_close.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_close.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_codec.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_codec.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_color.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_color.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_compress.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_compress.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_dir.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_dir.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_dirinfo.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_dirinfo.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_dirread.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_dirread.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_dirwrite.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_dirwrite.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_dumpmode.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_dumpmode.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_error.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_error.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_extension.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_extension.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_fax3.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_fax3.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_fax3sm.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_fax3sm.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_flush.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_flush.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_getimage.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_getimage.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_jpeg.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_jpeg.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_luv.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_luv.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_lzw.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_lzw.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_next.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_next.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_ojpeg.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_ojpeg.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_open.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_open.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_packbits.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_packbits.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_pixarlog.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_pixarlog.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_predict.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_predict.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_print.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_print.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_read.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_read.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_strip.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_strip.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_swab.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_swab.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_thunder.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_thunder.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_tile.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_tile.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_version.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_version.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_warning.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_warning.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_win32.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_win32.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_write.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_write.c">
+ </File>
<File
- RelativePath="..\..\src\tiff\libtiff\tif_zip.c"/>
+ RelativePath="..\..\src\tiff\libtiff\tif_zip.c">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc7_wxzlib.vcproj b/build/msw/wx_vc7_wxzlib.vcproj
index c0f180feb9..eb75fe5dac 100644
--- a/build/msw/wx_vc7_wxzlib.vcproj
+++ b/build/msw/wx_vc7_wxzlib.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,61 +22,51 @@
IntermediateDirectory="vc_mswunivudll\wxzlib"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=""
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\wxzlib\"
ObjectFile="vc_mswunivudll\wxzlib\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxzlib.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_dll\wxzlib.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_dll\wxzlib.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ AdditionalIncludeDirectories=""/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_wxzlib.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -84,61 +74,54 @@
IntermediateDirectory="vc_mswunivuddll\wxzlib"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=""
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\wxzlib\"
ObjectFile="vc_mswunivuddll\wxzlib\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxzlibd.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_dll\wxzlibd.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_dll\wxzlibd.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ AdditionalIncludeDirectories=""/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_wxzlib.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -146,61 +129,51 @@
IntermediateDirectory="vc_mswudll\wxzlib"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=""
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\wxzlib\"
ObjectFile="vc_mswudll\wxzlib\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxzlib.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_dll\wxzlib.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_dll\wxzlib.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ AdditionalIncludeDirectories=""/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_wxzlib.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -208,61 +181,54 @@
IntermediateDirectory="vc_mswuddll\wxzlib"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=""
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\wxzlib\"
ObjectFile="vc_mswuddll\wxzlib\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxzlibd.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_dll\wxzlibd.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_dll\wxzlibd.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ AdditionalIncludeDirectories=""/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_wxzlib.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -270,61 +236,51 @@
IntermediateDirectory="vc_mswunivu\wxzlib"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=""
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\wxzlib\"
ObjectFile="vc_mswunivu\wxzlib\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxzlib.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxzlib.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxzlib.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ AdditionalIncludeDirectories=""/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_wxzlib.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -332,61 +288,54 @@
IntermediateDirectory="vc_mswunivud\wxzlib"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=""
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\wxzlib\"
ObjectFile="vc_mswunivud\wxzlib\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxzlibd.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxzlibd.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxzlibd.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ AdditionalIncludeDirectories=""/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_wxzlib.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -394,61 +343,51 @@
IntermediateDirectory="vc_mswu\wxzlib"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=""
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\wxzlib\"
ObjectFile="vc_mswu\wxzlib\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxzlib.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxzlib.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxzlib.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ AdditionalIncludeDirectories=""/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_wxzlib.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -456,61 +395,54 @@
IntermediateDirectory="vc_mswud\wxzlib"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=""
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\wxzlib\"
ObjectFile="vc_mswud\wxzlib\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxzlibd.pdb"
- WarningLevel="1"
- SuppressStartupBanner="true"/>
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxzlibd.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxzlibd.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ AdditionalIncludeDirectories=""/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_wxzlib.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -519,32 +451,44 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath="..\..\src\zlib\adler32.c"/>
+ RelativePath="..\..\src\zlib\adler32.c">
+ </File>
<File
- RelativePath="..\..\src\zlib\compress.c"/>
+ RelativePath="..\..\src\zlib\compress.c">
+ </File>
<File
- RelativePath="..\..\src\zlib\crc32.c"/>
+ RelativePath="..\..\src\zlib\crc32.c">
+ </File>
<File
- RelativePath="..\..\src\zlib\deflate.c"/>
+ RelativePath="..\..\src\zlib\deflate.c">
+ </File>
<File
- RelativePath="..\..\src\zlib\gzio.c"/>
+ RelativePath="..\..\src\zlib\gzio.c">
+ </File>
<File
- RelativePath="..\..\src\zlib\infback.c"/>
+ RelativePath="..\..\src\zlib\infback.c">
+ </File>
<File
- RelativePath="..\..\src\zlib\inffast.c"/>
+ RelativePath="..\..\src\zlib\inffast.c">
+ </File>
<File
- RelativePath="..\..\src\zlib\inflate.c"/>
+ RelativePath="..\..\src\zlib\inflate.c">
+ </File>
<File
- RelativePath="..\..\src\zlib\inftrees.c"/>
+ RelativePath="..\..\src\zlib\inftrees.c">
+ </File>
<File
- RelativePath="..\..\src\zlib\trees.c"/>
+ RelativePath="..\..\src\zlib\trees.c">
+ </File>
<File
- RelativePath="..\..\src\zlib\uncompr.c"/>
+ RelativePath="..\..\src\zlib\uncompr.c">
+ </File>
<File
- RelativePath="..\..\src\zlib\zutil.c"/>
+ RelativePath="..\..\src\zlib\zutil.c">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc7_xml.vcproj b/build/msw/wx_vc7_xml.vcproj
index 9ea3b787c7..b35e4cacb4 100644
--- a/build/msw/wx_vc7_xml.vcproj
+++ b/build/msw/wx_vc7_xml.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,32 +22,16 @@
IntermediateDirectory="vc_mswunivudll\xml"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivudll\wxprec_xmldll.pch"
@@ -55,40 +39,46 @@
ObjectFile="vc_mswunivudll\xml\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290u_xml_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxbase290u_xml_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase29u_xml.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290u_xml_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_xml.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -96,32 +86,19 @@
IntermediateDirectory="vc_mswunivuddll\xml"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivuddll\wxprec_xmldll.pch"
@@ -129,40 +106,46 @@
ObjectFile="vc_mswunivuddll\xml\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290ud_xml_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxbase290ud_xml_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase29ud_xml.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290ud_xml_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_xml.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -170,32 +153,16 @@
IntermediateDirectory="vc_mswudll\xml"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_xmldll.pch"
@@ -203,40 +170,46 @@
ObjectFile="vc_mswudll\xml\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290u_xml_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxbase290u_xml_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase29u_xml.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290u_xml_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_xml.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -244,32 +217,19 @@
IntermediateDirectory="vc_mswuddll\xml"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_xmldll.pch"
@@ -277,40 +237,46 @@
ObjectFile="vc_mswuddll\xml\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290ud_xml_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxbase290ud_xml_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase29ud_xml.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290ud_xml_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_xml.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -318,32 +284,16 @@
IntermediateDirectory="vc_mswunivu\xml"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivu\wxprec_xmllib.pch"
@@ -351,32 +301,38 @@
ObjectFile="vc_mswunivu\xml\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29u_xml.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxbase29u_xml.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxbase29u_xml.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_xml.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -384,32 +340,19 @@
IntermediateDirectory="vc_mswunivud\xml"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivud\wxprec_xmllib.pch"
@@ -417,32 +360,38 @@
ObjectFile="vc_mswunivud\xml\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29ud_xml.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxbase29ud_xml.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxbase29ud_xml.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_xml.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -450,32 +399,16 @@
IntermediateDirectory="vc_mswu\xml"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswu\wxprec_xmllib.pch"
@@ -483,32 +416,38 @@
ObjectFile="vc_mswu\xml\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29u_xml.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxbase29u_xml.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxbase29u_xml.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_xml.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -516,32 +455,19 @@
IntermediateDirectory="vc_mswud\xml"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswud\wxprec_xmllib.pch"
@@ -549,32 +475,38 @@
ObjectFile="vc_mswud\xml\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29ud_xml.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxbase29ud_xml.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxbase29ud_xml.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_xml.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -636,7 +568,8 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\common\xtixml.cpp"/>
+ RelativePath="..\..\src\common\xtixml.cpp">
+ </File>
</Filter>
<Filter
Name="MSW Sources"
@@ -645,16 +578,16 @@
RelativePath="..\..\src\msw\version.rc">
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
</Filter>
<Filter
@@ -838,16 +771,19 @@
Name="Common Headers"
UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}">
<File
- RelativePath="..\..\include\wx\xml\xml.h"/>
+ RelativePath="..\..\include\wx\xml\xml.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xtixml.h"/>
+ RelativePath="..\..\include\wx\xtixml.h">
+ </File>
</Filter>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath="..\..\src\xml\xml.cpp"/>
+ RelativePath="..\..\src\xml\xml.cpp">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc7_xrc.vcproj b/build/msw/wx_vc7_xrc.vcproj
index 1a4ba550c0..c56ddf8cf0 100644
--- a/build/msw/wx_vc7_xrc.vcproj
+++ b/build/msw/wx_vc7_xrc.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,32 +22,16 @@
IntermediateDirectory="vc_mswunivudll\xrc"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivudll\wxprec_xrcdll.pch"
@@ -55,40 +39,46 @@
ObjectFile="vc_mswunivudll\xrc\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_xrc_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290u_xrc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_xrc.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_xrc_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_xrc.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -96,32 +86,19 @@
IntermediateDirectory="vc_mswunivuddll\xrc"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivuddll\wxprec_xrcdll.pch"
@@ -129,40 +106,46 @@
ObjectFile="vc_mswunivuddll\xrc\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_xrc_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_xrc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_xrc.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_xrc_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_xrc.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -170,32 +153,16 @@
IntermediateDirectory="vc_mswudll\xrc"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_xrcdll.pch"
@@ -203,40 +170,46 @@
ObjectFile="vc_mswudll\xrc\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_xrc_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290u_xrc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29u_xrc.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_xrc_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_xrc.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -244,32 +217,19 @@
IntermediateDirectory="vc_mswuddll\xrc"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_xrcdll.pch"
@@ -277,40 +237,46 @@
ObjectFile="vc_mswuddll\xrc\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_xrc_vc_custom.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290ud_xrc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_xrc.lib"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290ud_xrc_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc7_xrc.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -318,32 +284,16 @@
IntermediateDirectory="vc_mswunivu\xrc"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivu\wxprec_xrclib.pch"
@@ -351,32 +301,38 @@
ObjectFile="vc_mswunivu\xrc\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_xrc.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmswuniv29u_xrc.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmswuniv29u_xrc.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_xrc.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -384,32 +340,19 @@
IntermediateDirectory="vc_mswunivud\xrc"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivud\wxprec_xrclib.pch"
@@ -417,32 +360,38 @@
ObjectFile="vc_mswunivud\xrc\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_xrc.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_xrc.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_xrc.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_xrc.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -450,32 +399,16 @@
IntermediateDirectory="vc_mswu\xrc"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswu\wxprec_xrclib.pch"
@@ -483,32 +416,38 @@
ObjectFile="vc_mswu\xrc\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_xrc.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmsw29u_xrc.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmsw29u_xrc.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_xrc.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -516,32 +455,19 @@
IntermediateDirectory="vc_mswud\xrc"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswud\wxprec_xrclib.pch"
@@ -549,32 +475,38 @@
ObjectFile="vc_mswud\xrc\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_xrc.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmsw29ud_xrc.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmsw29ud_xrc.lib"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc7_xrc.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -643,16 +575,16 @@
RelativePath="..\..\src\msw\version.rc">
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
</Filter>
<Filter
@@ -836,240 +768,355 @@
Name="Common Headers"
UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}">
<File
- RelativePath="..\..\include\wx\xrc\xh_all.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_all.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_animatctrl.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_animatctrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_bmp.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_bmp.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_bmpbt.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_bmpbt.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_bmpcbox.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_bmpcbox.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_bttn.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_bttn.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_cald.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_cald.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_chckb.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_chckb.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_chckl.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_chckl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_choic.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_choic.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_choicbk.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_choicbk.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_clrpicker.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_clrpicker.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_collpane.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_collpane.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_combo.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_combo.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_datectrl.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_datectrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_dirpicker.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_dirpicker.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_dlg.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_dlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_filepicker.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_filepicker.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_fontpicker.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_fontpicker.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_frame.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_frame.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_gauge.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_gauge.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_gdctl.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_gdctl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_grid.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_grid.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_html.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_html.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_htmllbox.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_htmllbox.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_hyperlink.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_hyperlink.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_listb.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_listb.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_listbk.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_listbk.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_listc.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_listc.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_mdi.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_mdi.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_menu.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_menu.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_notbk.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_notbk.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_odcombo.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_odcombo.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_panel.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_panel.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_propdlg.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_propdlg.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_radbt.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_radbt.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_radbx.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_radbx.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_scrol.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_scrol.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_scwin.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_scwin.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_sizer.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_sizer.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_slidr.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_slidr.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_spin.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_spin.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_split.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_split.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_srchctrl.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_srchctrl.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_statbar.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_statbar.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_stbmp.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_stbmp.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_stbox.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_stbox.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_stlin.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_stlin.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_sttxt.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_sttxt.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_text.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_text.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_tglbtn.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_toolb.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_toolb.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_tree.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_tree.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_treebk.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_treebk.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_unkwn.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_unkwn.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xh_wizrd.h"/>
+ RelativePath="..\..\include\wx\xrc\xh_wizrd.h">
+ </File>
<File
- RelativePath="..\..\include\wx\xrc\xmlres.h"/>
+ RelativePath="..\..\include\wx\xrc\xmlres.h">
+ </File>
</Filter>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath="..\..\src\xrc\xh_animatctrl.cpp"/>
+ RelativePath="..\..\src\xrc\xh_animatctrl.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_bmp.cpp"/>
+ RelativePath="..\..\src\xrc\xh_bmp.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_bmpbt.cpp"/>
+ RelativePath="..\..\src\xrc\xh_bmpbt.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_bmpcbox.cpp"/>
+ RelativePath="..\..\src\xrc\xh_bmpcbox.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_bttn.cpp"/>
+ RelativePath="..\..\src\xrc\xh_bttn.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_cald.cpp"/>
+ RelativePath="..\..\src\xrc\xh_cald.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_chckb.cpp"/>
+ RelativePath="..\..\src\xrc\xh_chckb.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_chckl.cpp"/>
+ RelativePath="..\..\src\xrc\xh_chckl.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_choic.cpp"/>
+ RelativePath="..\..\src\xrc\xh_choic.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_choicbk.cpp"/>
+ RelativePath="..\..\src\xrc\xh_choicbk.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_clrpicker.cpp"/>
+ RelativePath="..\..\src\xrc\xh_clrpicker.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_collpane.cpp"/>
+ RelativePath="..\..\src\xrc\xh_collpane.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_combo.cpp"/>
+ RelativePath="..\..\src\xrc\xh_combo.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_datectrl.cpp"/>
+ RelativePath="..\..\src\xrc\xh_datectrl.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_dirpicker.cpp"/>
+ RelativePath="..\..\src\xrc\xh_dirpicker.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_dlg.cpp"/>
+ RelativePath="..\..\src\xrc\xh_dlg.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_filepicker.cpp"/>
+ RelativePath="..\..\src\xrc\xh_filepicker.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_fontpicker.cpp"/>
+ RelativePath="..\..\src\xrc\xh_fontpicker.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_frame.cpp"/>
+ RelativePath="..\..\src\xrc\xh_frame.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_gauge.cpp"/>
+ RelativePath="..\..\src\xrc\xh_gauge.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_gdctl.cpp"/>
+ RelativePath="..\..\src\xrc\xh_gdctl.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_grid.cpp"/>
+ RelativePath="..\..\src\xrc\xh_grid.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_html.cpp"/>
+ RelativePath="..\..\src\xrc\xh_html.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_htmllbox.cpp"/>
+ RelativePath="..\..\src\xrc\xh_htmllbox.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_hyperlink.cpp"/>
+ RelativePath="..\..\src\xrc\xh_hyperlink.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_listb.cpp"/>
+ RelativePath="..\..\src\xrc\xh_listb.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_listbk.cpp"/>
+ RelativePath="..\..\src\xrc\xh_listbk.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_listc.cpp"/>
+ RelativePath="..\..\src\xrc\xh_listc.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_mdi.cpp"/>
+ RelativePath="..\..\src\xrc\xh_mdi.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_menu.cpp"/>
+ RelativePath="..\..\src\xrc\xh_menu.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_notbk.cpp"/>
+ RelativePath="..\..\src\xrc\xh_notbk.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_odcombo.cpp"/>
+ RelativePath="..\..\src\xrc\xh_odcombo.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_panel.cpp"/>
+ RelativePath="..\..\src\xrc\xh_panel.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_propdlg.cpp"/>
+ RelativePath="..\..\src\xrc\xh_propdlg.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_radbt.cpp"/>
+ RelativePath="..\..\src\xrc\xh_radbt.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_radbx.cpp"/>
+ RelativePath="..\..\src\xrc\xh_radbx.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_scrol.cpp"/>
+ RelativePath="..\..\src\xrc\xh_scrol.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_scwin.cpp"/>
+ RelativePath="..\..\src\xrc\xh_scwin.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_sizer.cpp"/>
+ RelativePath="..\..\src\xrc\xh_sizer.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_slidr.cpp"/>
+ RelativePath="..\..\src\xrc\xh_slidr.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_spin.cpp"/>
+ RelativePath="..\..\src\xrc\xh_spin.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_split.cpp"/>
+ RelativePath="..\..\src\xrc\xh_split.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_srchctrl.cpp"/>
+ RelativePath="..\..\src\xrc\xh_srchctrl.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_statbar.cpp"/>
+ RelativePath="..\..\src\xrc\xh_statbar.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_stbmp.cpp"/>
+ RelativePath="..\..\src\xrc\xh_stbmp.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_stbox.cpp"/>
+ RelativePath="..\..\src\xrc\xh_stbox.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_stlin.cpp"/>
+ RelativePath="..\..\src\xrc\xh_stlin.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_sttxt.cpp"/>
+ RelativePath="..\..\src\xrc\xh_sttxt.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_text.cpp"/>
+ RelativePath="..\..\src\xrc\xh_text.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_tglbtn.cpp"/>
+ RelativePath="..\..\src\xrc\xh_tglbtn.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_toolb.cpp"/>
+ RelativePath="..\..\src\xrc\xh_toolb.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_tree.cpp"/>
+ RelativePath="..\..\src\xrc\xh_tree.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_treebk.cpp"/>
+ RelativePath="..\..\src\xrc\xh_treebk.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_unkwn.cpp"/>
+ RelativePath="..\..\src\xrc\xh_unkwn.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xh_wizrd.cpp"/>
+ RelativePath="..\..\src\xrc\xh_wizrd.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xmladv.cpp"/>
+ RelativePath="..\..\src\xrc\xmladv.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xmlres.cpp"/>
+ RelativePath="..\..\src\xrc\xmlres.cpp">
+ </File>
<File
- RelativePath="..\..\src\xrc\xmlrsall.cpp"/>
+ RelativePath="..\..\src\xrc\xmlrsall.cpp">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc8_adv.vcproj b/build/msw/wx_vc8_adv.vcproj
index a4dfed1f16..683b7ad659 100644
--- a/build/msw/wx_vc8_adv.vcproj
+++ b/build/msw/wx_vc8_adv.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,23 +43,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivudll\wxprec_advdll.pch"
AssemblerListingLocation="vc_mswunivudll\adv\"
@@ -67,23 +61,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_adv_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290u_adv_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_adv.lib"
@@ -97,6 +93,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -134,23 +133,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivuddll\wxprec_advdll.pch"
AssemblerListingLocation="vc_mswunivuddll\adv\"
@@ -158,23 +154,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_adv_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_adv_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_adv.lib"
@@ -188,6 +186,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -225,23 +226,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_advdll.pch"
AssemblerListingLocation="vc_mswudll\adv\"
@@ -249,23 +244,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_adv_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290u_adv_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29u_adv.lib"
@@ -279,6 +276,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -316,23 +316,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_advdll.pch"
AssemblerListingLocation="vc_mswuddll\adv\"
@@ -340,23 +337,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_adv_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290ud_adv_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_adv.lib"
@@ -370,6 +369,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -407,23 +409,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivu\wxprec_advlib.pch"
AssemblerListingLocation="vc_mswunivu\adv\"
@@ -431,15 +427,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_adv.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -452,6 +450,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -489,23 +490,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivud\wxprec_advlib.pch"
AssemblerListingLocation="vc_mswunivud\adv\"
@@ -513,15 +511,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_adv.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -534,6 +534,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -571,23 +574,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswu\wxprec_advlib.pch"
AssemblerListingLocation="vc_mswu\adv\"
@@ -595,15 +592,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_adv.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -616,6 +615,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -653,23 +655,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswud\wxprec_advlib.pch"
AssemblerListingLocation="vc_mswud\adv\"
@@ -677,15 +676,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_adv.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -698,6 +699,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -724,16 +728,20 @@
>
<File
RelativePath="..\..\src\common\animatecmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\bmpcboxcmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\calctrlcmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\datavcmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\dummy.cpp"
>
@@ -804,10 +812,12 @@
</File>
<File
RelativePath="..\..\src\common\hyperlnkcmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\taskbarcmn.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="MSW Sources"
@@ -815,7 +825,8 @@
>
<File
RelativePath="..\..\src\msw\aboutdlg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\bmpcbox.cpp"
>
@@ -898,16 +909,20 @@
</File>
<File
RelativePath="..\..\src\msw\joystick.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\notifmsg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\sound.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\taskbar.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\version.rc"
>
@@ -935,64 +950,84 @@
>
<File
RelativePath="..\..\src\generic\aboutdlgg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\animateg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\bmpcboxg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\calctrlg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\datavgen.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\datectlg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\editlbox.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\grid.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\gridctrl.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\gridsel.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\helpext.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\hyperlinkg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\laywin.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\notifmsgg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\odcombo.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\propdlg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\sashwin.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\splash.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\tipdlg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\wizard.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Setup Headers"
@@ -1125,16 +1160,20 @@
>
<File
RelativePath="..\..\include\wx\msw\bmpcbox.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\calctrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\datecontrols.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\datectrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\genrcdefs.h"
>
@@ -1229,16 +1268,20 @@
</File>
<File
RelativePath="..\..\include\wx\msw\joystick.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\notifmsg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\sound.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\taskbar.h"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Generic Headers"
@@ -1246,55 +1289,72 @@
>
<File
RelativePath="..\..\include\wx\generic\aboutdlgg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\animate.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\bmpcbox.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\calctrlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\dataview.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\datectrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\grid.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\gridctrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\gridsel.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\helpext.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\hyperlink.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\laywin.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\notifmsg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\propdlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\sashwin.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\splash.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\wizard.h"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Common Headers"
@@ -1302,70 +1362,92 @@
>
<File
RelativePath="..\..\include\wx\aboutdlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\animate.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\bmpcbox.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\calctrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\dataview.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\datectrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\dateevt.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\dcbuffer.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\editlbox.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\grid.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\hyperlink.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\joystick.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\laywin.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\notifmsg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\odcombo.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\propdlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\sashwin.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\sound.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\splash.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\taskbar.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\tipdlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\wizard.h"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc8_aui.vcproj b/build/msw/wx_vc8_aui.vcproj
index 7d2793fb41..7a626dd050 100644
--- a/build/msw/wx_vc8_aui.vcproj
+++ b/build/msw/wx_vc8_aui.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,23 +43,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivudll\wxprec_auidll.pch"
AssemblerListingLocation="vc_mswunivudll\aui\"
@@ -67,23 +61,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_aui_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290u_aui_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_aui.lib"
@@ -97,6 +93,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -134,23 +133,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivuddll\wxprec_auidll.pch"
AssemblerListingLocation="vc_mswunivuddll\aui\"
@@ -158,23 +154,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_aui_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_aui_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_aui.lib"
@@ -188,6 +186,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -225,23 +226,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_auidll.pch"
AssemblerListingLocation="vc_mswudll\aui\"
@@ -249,23 +244,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_aui_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290u_aui_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29u_aui.lib"
@@ -279,6 +276,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -316,23 +316,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_auidll.pch"
AssemblerListingLocation="vc_mswuddll\aui\"
@@ -340,23 +337,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_aui_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290ud_aui_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_aui.lib"
@@ -370,6 +369,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -407,23 +409,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivu\wxprec_auilib.pch"
AssemblerListingLocation="vc_mswunivu\aui\"
@@ -431,15 +427,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_aui.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -452,6 +450,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -489,23 +490,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivud\wxprec_auilib.pch"
AssemblerListingLocation="vc_mswunivud\aui\"
@@ -513,15 +511,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_aui.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -534,6 +534,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -571,23 +574,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswu\wxprec_auilib.pch"
AssemblerListingLocation="vc_mswu\aui\"
@@ -595,15 +592,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_aui.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -616,6 +615,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -653,23 +655,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswud\wxprec_auilib.pch"
AssemblerListingLocation="vc_mswud\aui\"
@@ -677,15 +676,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_aui.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -698,6 +699,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -1044,49 +1048,62 @@
>
<File
RelativePath="..\..\include\wx\aui\aui.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\aui\auibar.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\aui\auibook.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\aui\dockart.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\aui\floatpane.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\aui\framemanager.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\aui\tabmdi.h"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\src\aui\auibar.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\aui\auibook.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\aui\dockart.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\aui\floatpane.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\aui\framemanager.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\aui\tabmdi.cpp"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc8_base.vcproj b/build/msw/wx_vc8_base.vcproj
index ea94390207..6b0e3e8464 100644
--- a/build/msw/wx_vc8_base.vcproj
+++ b/build/msw/wx_vc8_base.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,23 +43,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivudll\wxprec_basedll.pch"
AssemblerListingLocation="vc_mswunivudll\base\"
@@ -67,23 +61,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290u_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
OutputFile="..\..\lib\vc_dll\wxbase290u_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib"
@@ -97,6 +93,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -134,23 +133,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivuddll\wxprec_basedll.pch"
AssemblerListingLocation="vc_mswunivuddll\base\"
@@ -158,23 +154,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290ud_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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"
AdditionalOptions=""
+ AdditionalDependencies="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"
OutputFile="..\..\lib\vc_dll\wxbase290ud_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase29ud.lib"
@@ -188,6 +186,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -225,23 +226,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_basedll.pch"
AssemblerListingLocation="vc_mswudll\base\"
@@ -249,23 +244,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290u_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
OutputFile="..\..\lib\vc_dll\wxbase290u_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib"
@@ -279,6 +276,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -316,23 +316,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_basedll.pch"
AssemblerListingLocation="vc_mswuddll\base\"
@@ -340,23 +337,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290ud_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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"
AdditionalOptions=""
+ AdditionalDependencies="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"
OutputFile="..\..\lib\vc_dll\wxbase290ud_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase29ud.lib"
@@ -370,6 +369,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -407,23 +409,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivu\wxprec_baselib.pch"
AssemblerListingLocation="vc_mswunivu\base\"
@@ -431,15 +427,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29u.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -452,6 +450,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -489,23 +490,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivud\wxprec_baselib.pch"
AssemblerListingLocation="vc_mswunivud\base\"
@@ -513,15 +511,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29ud.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -534,6 +534,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -571,23 +574,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswu\wxprec_baselib.pch"
AssemblerListingLocation="vc_mswu\base\"
@@ -595,15 +592,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29u.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -616,6 +615,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -653,23 +655,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswud\wxprec_baselib.pch"
AssemblerListingLocation="vc_mswud\base\"
@@ -677,15 +676,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29ud.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -698,6 +699,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -724,43 +728,56 @@
>
<File
RelativePath="..\..\src\common\appbase.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\arcall.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\arcfind.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\archive.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\arrstr.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\base64.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\clntdata.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\cmdline.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\config.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\convauto.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\datetime.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\datstrm.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\dircmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\dummy.cpp"
>
@@ -831,22 +848,28 @@
</File>
<File
RelativePath="..\..\src\common\dynarray.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\dynlib.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\dynload.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\encconv.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\event.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\evtloopcmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\extended.c"
>
@@ -917,187 +940,248 @@
</File>
<File
RelativePath="..\..\src\common\ffile.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\file.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\fileback.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\fileconf.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\filefn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\filename.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\filesys.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\filtall.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\filtfind.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\fmapbase.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\fs_arc.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\fs_filter.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\fs_mem.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\hash.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\hashmap.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\init.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\intl.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\ipcbase.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\list.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\log.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\longlong.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\memory.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\mimecmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\module.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\msgout.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\mstream.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\object.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\platinfo.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\powercmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\process.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\regex.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\sstream.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\stdpbase.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\stopwatch.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\strconv.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\stream.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\string.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\stringimpl.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\stringops.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\strvararg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\sysopt.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\tarstrm.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\textbuf.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\textfile.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\timercmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\timerimpl.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\tokenzr.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\txtstrm.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\unichar.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\uri.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\ustring.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\utilscmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\variant.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\wfstream.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\wxcrt.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\wxprintf.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\xlocale.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\xti.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\xtistrm.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\zipstrm.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\zstream.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="MSW Sources"
@@ -1105,64 +1189,84 @@
>
<File
RelativePath="..\..\src\msw\basemsw.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\crashrpt.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\dde.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\debughlp.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\dir.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\dlmsw.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\evtloop.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\main.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\mimetype.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\mslu.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\power.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\regconf.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\registry.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\snglinst.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\stackwalk.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\stdpaths.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\thread.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\timer.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\utils.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\utilsexc.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\version.rc"
>
@@ -1185,7 +1289,8 @@
</File>
<File
RelativePath="..\..\src\msw\volume.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Setup Headers"
@@ -1318,25 +1423,32 @@
>
<File
RelativePath="..\..\include\wx\msw\apptbase.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\apptrait.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\chkconf.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\crashrpt.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\dde.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\debughlp.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\gccpriv.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\genrcdefs.h"
>
@@ -1431,43 +1543,56 @@
</File>
<File
RelativePath="..\..\include\wx\msw\libraries.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\mimetype.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\mslu.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\private.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\regconf.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\registry.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\seh.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\stackwalk.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\stdpaths.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\winundef.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\wrapcctl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\wrapcdlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\wrapwin.h"
- />
+ >
+ </File>
</Filter>
<Filter
Name="wxHTML Headers"
@@ -1475,7 +1600,8 @@
>
<File
RelativePath="..\..\include\wx\html\forcelnk.h"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Common Headers"
@@ -1483,391 +1609,528 @@
>
<File
RelativePath="..\..\include\wx\afterstd.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\app.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\apptrait.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\archive.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\arrstr.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\atomic.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\base64.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\beforestd.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\buffer.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\build.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\chartype.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\chkconf.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\clntdata.h"
- />
- <File
+ >
+ </File>
+ <File
RelativePath="..\..\include\wx\cmdargs.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\cmdline.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\confbase.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\config.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\containr.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\convauto.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\meta\convertible.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\cpp.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\crt.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\datetime.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\datstrm.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\dde.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\debug.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\defs.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\dir.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\dlimpexp.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\dlist.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\dynarray.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\dynlib.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\dynload.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\encconv.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\event.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\except.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\features.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\ffile.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\file.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\fileconf.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\filefn.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\filename.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\filesys.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\flags.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\fontenc.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\fontmap.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\fs_arc.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\fs_filter.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\fs_mem.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\fs_zip.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\hash.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\hashmap.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\hashset.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\iconloc.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\meta\if.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\init.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\meta\int2type.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\intl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\iosfwrap.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\ioswrap.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\ipc.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\ipcbase.h"
- />
+ >
+ </File>
+ <File
+ RelativePath="..\..\include\wx\kbdstate.h"
+ >
+ </File>
<File
RelativePath="..\..\include\wx\link.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\list.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\log.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\longlong.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\math.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\memconf.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\memory.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\memtext.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\mimetype.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\module.h"
- />
+ >
+ </File>
+ <File
+ RelativePath="..\..\include\wx\mousestate.h"
+ >
+ </File>
<File
RelativePath="..\..\include\wx\meta\movable.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msgout.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\mstream.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\object.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\platform.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\platinfo.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\power.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\process.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\ptr_scpd.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\ptr_shrd.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\recguard.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\regex.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\scopeguard.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\snglinst.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\sstream.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\stack.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\stackwalk.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\stdpaths.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\stockitem.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\stopwatch.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\strconv.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\stream.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\string.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\stringimpl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\stringops.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\strvararg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\sysopt.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\tarstrm.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\textbuf.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\textfile.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\thread.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\timer.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\tokenzr.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\tracker.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\txtstrm.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\types.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\unichar.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\uri.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\ustring.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\utils.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\variant.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\vector.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\version.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\volume.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\weakref.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\wfstream.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\wx.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\wxchar.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\wxcrt.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\wxcrtbase.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\wxcrtvararg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\wxprec.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xlocale.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xti.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xtistrm.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\zipstrm.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\zstream.h"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj
index a835dea333..b1ad4b673f 100644
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,23 +43,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivudll\wxprec_coredll.pch"
AssemblerListingLocation="vc_mswunivudll\core\"
@@ -67,23 +61,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_core.lib"
@@ -97,6 +93,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -134,23 +133,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivuddll\wxprec_coredll.pch"
AssemblerListingLocation="vc_mswunivuddll\core\"
@@ -158,23 +154,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_core.lib"
@@ -188,6 +186,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -225,23 +226,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch"
AssemblerListingLocation="vc_mswudll\core\"
@@ -249,23 +244,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29u_core.lib"
@@ -279,6 +276,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -316,23 +316,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch"
AssemblerListingLocation="vc_mswuddll\core\"
@@ -340,23 +337,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_core.lib"
@@ -370,6 +369,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -407,23 +409,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivu\wxprec_corelib.pch"
AssemblerListingLocation="vc_mswunivu\core\"
@@ -431,15 +427,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_core.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -452,6 +450,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -489,23 +490,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivud\wxprec_corelib.pch"
AssemblerListingLocation="vc_mswunivud\core\"
@@ -513,15 +511,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_core.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -534,6 +534,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -571,23 +574,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswu\wxprec_corelib.pch"
AssemblerListingLocation="vc_mswu\core\"
@@ -595,15 +592,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_core.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -616,6 +615,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -653,23 +655,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswud\wxprec_corelib.pch"
AssemblerListingLocation="vc_mswud\core\"
@@ -677,15 +676,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_core.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -698,6 +699,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -724,103 +728,136 @@
>
<File
RelativePath="..\..\src\common\accelcmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\accesscmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\anidecod.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\appcmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\artprov.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\artstd.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\bmpbase.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\bookctrl.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\btncmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\cairo.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\choiccmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\clipcmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\clrpickercmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\cmdproc.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\cmndata.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\colourcmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\combocmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\containr.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\cshelp.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\ctrlcmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\ctrlsub.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\datacmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\dcbase.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\dcbufcmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\dcgraph.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\dcsvg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\dlgcmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\dndcmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\dobjcmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\docmdi.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\docview.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\dpycmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\dseldlg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\dummy.cpp"
>
@@ -891,211 +928,280 @@
</File>
<File
RelativePath="..\..\src\common\effects.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\event.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\fddlgcmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\filectrlcmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\filepickercmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\fldlgcmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\fontcmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\fontenumcmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\fontmap.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\fontpickercmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\fontutilcmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\framecmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\fs_mem.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\gaugecmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\gbsizer.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\gdicmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\geometry.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\gifdecod.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\graphcmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\helpbase.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\iconbndl.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\imagall.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\imagbmp.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\image.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\imagfill.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\imaggif.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\imagiff.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\imagjpeg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\imagpcx.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\imagpng.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\imagpnm.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\imagtga.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\imagtiff.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\imagxpm.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\layout.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\lboxcmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\listctrlcmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\matrix.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\menucmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\msgout.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\nbkbase.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\overlaycmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\paper.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\pickerbase.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\popupcmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\prntbase.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\quantize.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\radiocmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\rendcmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\rgncmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\settcmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\sizer.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\srchcmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\statbar.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\stattextcmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\stockitem.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\tbarbase.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\textcmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\textentrycmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\toplvcmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\treebase.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\utilscmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\valgen.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\validate.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\valtext.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\wincmn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\windowid.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\wrapsizer.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\xpmdecod.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="MSW Sources"
@@ -1143,13 +1249,16 @@
</File>
<File
RelativePath="..\..\src\msw\app.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\ole\automtn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\bitmap.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\bmpbuttn.cpp"
>
@@ -1172,7 +1281,8 @@
</File>
<File
RelativePath="..\..\src\msw\brush.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\button.cpp"
>
@@ -1195,7 +1305,8 @@
</File>
<File
RelativePath="..\..\src\msw\caret.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\checkbox.cpp"
>
@@ -1258,7 +1369,8 @@
</File>
<File
RelativePath="..\..\src\msw\clipbrd.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\colordlg.cpp"
>
@@ -1281,7 +1393,8 @@
</File>
<File
RelativePath="..\..\src\msw\colour.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\combo.cpp"
>
@@ -1344,28 +1457,36 @@
</File>
<File
RelativePath="..\..\src\msw\cursor.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\data.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\ole\dataobj.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\dc.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\dcclient.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\dcmemory.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\dcprint.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\dcscreen.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\dialog.cpp"
>
@@ -1388,10 +1509,12 @@
</File>
<File
RelativePath="..\..\src\msw\dialup.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\dib.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\dirdlg.cpp"
>
@@ -1414,7 +1537,8 @@
</File>
<File
RelativePath="..\..\src\msw\display.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\dragimag.cpp"
>
@@ -1437,16 +1561,20 @@
</File>
<File
RelativePath="..\..\src\msw\ole\dropsrc.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\ole\droptgt.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\enhmeta.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\evtloop.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\fdrepdlg.cpp"
>
@@ -1489,7 +1617,8 @@
</File>
<File
RelativePath="..\..\src\msw\font.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\fontdlg.cpp"
>
@@ -1512,10 +1641,12 @@
</File>
<File
RelativePath="..\..\src\msw\fontenum.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\fontutil.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\frame.cpp"
>
@@ -1558,29 +1689,37 @@
</File>
<File
RelativePath="..\..\src\msw\gdiimage.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\gdiobj.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\gdiplus.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\graphics.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\helpchm.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\helpwin.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\icon.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\imaglist.cpp"
- />
- <File
+ >
+ </File>
+ <File
RelativePath="..\..\src\msw\iniconf.cpp"
>
<FileConfiguration
@@ -1642,7 +1781,8 @@
</File>
<File
RelativePath="..\..\src\msw\main.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\mdi.cpp"
>
@@ -1725,7 +1865,8 @@
</File>
<File
RelativePath="..\..\src\msw\minifram.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\msgdlg.cpp"
>
@@ -1748,7 +1889,8 @@
</File>
<File
RelativePath="..\..\src\msw\mslu.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\nativdlg.cpp"
>
@@ -1811,7 +1953,8 @@
</File>
<File
RelativePath="..\..\src\msw\ole\oleutils.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\ownerdrw.cpp"
>
@@ -1834,19 +1977,24 @@
</File>
<File
RelativePath="..\..\src\msw\palette.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\pen.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\popupwin.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\printdlg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\printwin.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\radiobox.cpp"
>
@@ -1889,10 +2037,12 @@
</File>
<File
RelativePath="..\..\src\msw\region.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\renderer.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\scrolbar.cpp"
>
@@ -1915,7 +2065,8 @@
</File>
<File
RelativePath="..\..\src\msw\settings.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\slider.cpp"
>
@@ -2178,10 +2329,12 @@
</File>
<File
RelativePath="..\..\src\msw\tooltip.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\toplevel.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\treectrl.cpp"
>
@@ -2204,13 +2357,16 @@
</File>
<File
RelativePath="..\..\src\msw\utilsgui.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\ole\uuid.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\uxtheme.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\version.rc"
>
@@ -2233,10 +2389,12 @@
</File>
<File
RelativePath="..\..\src\msw\volume.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\window.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Generic Sources"
@@ -2264,22 +2422,28 @@
</File>
<File
RelativePath="..\..\src\generic\busyinfo.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\buttonbar.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\choicbkg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\choicdgg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\clrpickerg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\collpaneg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\colrdlgg.cpp"
>
@@ -2302,13 +2466,16 @@
</File>
<File
RelativePath="..\..\src\generic\combog.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\dcpsg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\dirctrlg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\dirdlgg.cpp"
>
@@ -2331,7 +2498,8 @@
</File>
<File
RelativePath="..\..\src\generic\dragimgg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\fdrepdlg.cpp"
>
@@ -2354,7 +2522,8 @@
</File>
<File
RelativePath="..\..\src\generic\filectrlg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\filedlgg.cpp"
>
@@ -2377,7 +2546,8 @@
</File>
<File
RelativePath="..\..\src\generic\filepickerg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\fontdlgg.cpp"
>
@@ -2400,10 +2570,12 @@
</File>
<File
RelativePath="..\..\src\generic\fontpickerg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\listbkg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\listctrl.cpp"
>
@@ -2426,7 +2598,8 @@
</File>
<File
RelativePath="..\..\src\generic\logg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\mdig.cpp"
>
@@ -2469,40 +2642,52 @@
</File>
<File
RelativePath="..\..\src\generic\numdlgg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\panelg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\printps.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\prntdlgg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\progdlgg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\renderg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\scrlwing.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\selstore.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\spinctlg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\splitter.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\srchctlg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\statbmpg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\statusbr.cpp"
>
@@ -2545,25 +2730,32 @@
</File>
<File
RelativePath="..\..\src\generic\textdlgg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\tipwin.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\toolbkg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\treebkg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\treectlg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\vlbox.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\generic\vscroll.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="wxUniv Sources"
@@ -3501,148 +3693,196 @@
>
<File
RelativePath="..\..\include\wx\msw\accel.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\ole\access.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\ole\activex.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\app.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\ole\automtn.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\bitmap.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\bmpbuttn.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\bmpcbox.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\brush.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\button.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\calctrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\caret.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\checkbox.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\checklst.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\choice.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\clipbrd.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\colordlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\colour.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\combo.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\combobox.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\control.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\ctrlsub.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\cursor.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\ole\dataform.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\ole\dataobj.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\ole\dataobj2.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\datecontrols.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\datectrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\dc.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\dcclient.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\dcmemory.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\dcprint.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\dcscreen.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\dialog.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\dib.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\dirdlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\dragimag.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\ole\dropsrc.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\ole\droptgt.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\enhmeta.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\evtloop.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\fdrepdlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\filedlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\font.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\fontdlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\frame.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\gauge.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\gdiimage.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\genrcdefs.h"
>
@@ -3737,169 +3977,224 @@
</File>
<File
RelativePath="..\..\include\wx\msw\glcanvas.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\helpbest.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\helpchm.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\helpwin.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\htmlhelp.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\icon.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\imaglist.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\iniconf.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\joystick.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\listbox.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\listctrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\mdi.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\menu.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\menuitem.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\metafile.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\minifram.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\missing.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\msgdlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\msvcrt.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\notebook.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\notifmsg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\ole\oleutils.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\palette.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\pen.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\popupwin.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\printdlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\printwin.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\radiobox.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\radiobut.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\rcdefs.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\region.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\scrolbar.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\setup0.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\slider.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\sound.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\spinbutt.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\spinctrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\statbmp.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\statbox.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\statline.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\stattext.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\statusbar.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\tabctrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\taskbar.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\textctrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\textentry.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\tglbtn.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\toolbar.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\tooltip.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\toplevel.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\treectrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\ole\uuid.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\uxtheme.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\uxthemep.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\window.h"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Generic Headers"
@@ -3907,169 +4202,224 @@
>
<File
RelativePath="..\..\include\wx\generic\aboutdlgg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\accel.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\animate.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\bmpcbox.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\busyinfo.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\buttonbar.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\calctrlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\choicdgg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\clrpickerg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\collpaneg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\colrdlgg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\combo.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\ctrlsub.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\dataview.h"
- />
- <File
+ >
+ </File>
+ <File
RelativePath="..\..\include\wx\generic\datectrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\dcpsg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\dirctrlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\dirdlgg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\dragimgg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\fdrepdlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\filectrlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\filedlgg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\filepickerg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\fontdlgg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\fontpickerg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\grid.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\gridctrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\gridsel.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\helpext.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\hyperlink.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\laywin.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\listctrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\logg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\mdig.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\msgdlgg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\notebook.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\notifmsg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\numdlgg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\panelg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\printps.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\prntdlgg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\progdlgg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\propdlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\sashwin.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\scrolwin.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\spinctlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\splash.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\splitter.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\srchctlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\statbmpg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\statusbr.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\tabg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\textdlgg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\treectlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\generic\wizard.h"
- />
+ >
+ </File>
</Filter>
<Filter
Name="wxUniv Headers"
@@ -4077,124 +4427,164 @@
>
<File
RelativePath="..\..\include\wx\univ\app.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\bmpbuttn.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\button.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\checkbox.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\checklst.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\chkconf.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\choice.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\colschem.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\combobox.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\control.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\dialog.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\frame.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\gauge.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\inpcons.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\inphand.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\listbox.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\menu.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\menuitem.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\notebook.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\radiobox.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\radiobut.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\renderer.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\scrarrow.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\scrolbar.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\scrthumb.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\scrtimer.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\slider.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\spinbutt.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\statbmp.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\statbox.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\statline.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\stattext.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\statusbr.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\stdrend.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\textctrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\tglbtn.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\theme.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\toolbar.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\toplevel.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\univ\window.h"
- />
+ >
+ </File>
</Filter>
<Filter
Name="wxHTML Headers"
@@ -4202,49 +4592,64 @@
>
<File
RelativePath="..\..\include\wx\html\helpctrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\html\helpdata.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\html\helpdlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\html\helpfrm.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\html\helpwnd.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\html\htmlcell.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\html\htmldefs.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\html\htmlfilt.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\html\htmlpars.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\html\htmlproc.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\html\htmltag.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\html\htmlwin.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\html\htmprint.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\html\m_templ.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\html\winpars.h"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Common Headers"
@@ -4252,844 +4657,1124 @@
>
<File
RelativePath="..\..\include\wx\aboutdlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\accel.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\access.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\propgrid\advprops.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\anidecod.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\animate.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\animdecod.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\artprov.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\aui\aui.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\aui\auibar.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\aui\auibook.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\bitmap.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\bmpbuttn.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\bmpcbox.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\bookctrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\brush.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\busyinfo.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\button.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\cairo.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\calctrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\caret.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\checkbox.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\checklst.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\choicdlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\choice.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\choicebk.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\clipbrd.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\clrpicker.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\cmdproc.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\cmndata.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\collpane.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\colordlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\colour.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\combo.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\combobox.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\control.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\cshelp.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\ctrlsub.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\cursor.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\dataobj.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\dataview.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\datectrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\dateevt.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\dc.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\dcbuffer.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\dcclient.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\dcgraph.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\dcmemory.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\dcmirror.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\dcprint.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\dcps.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\dcscreen.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\dcsvg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\debugrpt.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\dialog.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\dialup.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\dirctrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\dirdlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\display.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\display_impl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\dnd.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\aui\dockart.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\docmdi.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\docview.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\dragimag.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\editlbox.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\propgrid\editors.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\effects.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\encinfo.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\evtloop.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\fdrepdlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\filectrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\filedlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\filepicker.h"
- />
- <File
+ >
+ </File>
+ <File
RelativePath="..\..\include\wx\aui\floatpane.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\fmappriv.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\font.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\fontdlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\fontenum.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\fontpicker.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\fontutil.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\frame.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\aui\framemanager.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\gauge.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\gbsizer.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\gdicmn.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\gdiobj.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\geometry.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\gifdecod.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\glcanvas.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\graphics.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\grid.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\help.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\helpbase.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\helphtml.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\helpwin.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\htmllbox.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\hyperlink.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\icon.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\iconbndl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\imagbmp.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\image.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\imaggif.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\imagiff.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\imagjpeg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\imaglist.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\imagpcx.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\imagpng.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\imagpnm.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\imagtga.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\imagtiff.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\imagxpm.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\joystick.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\layout.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\laywin.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\listbase.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\listbook.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\listbox.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\listctrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\propgrid\manager.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\matrix.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\mdi.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\mediactrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\menu.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\menuitem.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\metafile.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\minifram.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msgdlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\nativewin.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\nonownedwnd.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\notebook.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\notifmsg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\numdlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\odcombo.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\overlay.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\ownerdrw.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\palette.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\panel.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\paper.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\pen.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\pickerbase.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\popupwin.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\position.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\print.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\printdlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\prntbase.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\progdlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\propdlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\propgrid\property.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\propgrid\propgrid.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\propgrid\propgriddefs.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\propgrid\propgridiface.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\propgrid\propgridpagestate.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\propgrid\props.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\quantize.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\radiobox.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\radiobut.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\rawbmp.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\region.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\renderer.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\richtext\richtextbuffer.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\richtext\richtextctrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\richtext\richtextformatdlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\richtext\richtexthtml.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\richtext\richtextprint.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\richtext\richtextstyledlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\richtext\richtextstyles.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\richtext\richtextxml.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\sashwin.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\scopeguard.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\scrolbar.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\scrolwin.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\selstore.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\settings.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\sizer.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\slider.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\sound.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\spinbutt.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\spinctrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\splash.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\splitter.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\srchctrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\statbmp.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\statbox.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\statline.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\stattext.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\statusbr.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\stc\stc.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\tab.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\tabctrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\aui\tabmdi.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\taskbar.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\tbarbase.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\textctrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\textdlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\textentry.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\tglbtn.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\tipdlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\tipwin.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\tls.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\toolbar.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\toolbook.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\tooltip.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\toplevel.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\treebase.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\treebook.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\treectrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\valgen.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\validate.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\valtext.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\vidmode.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\vlbox.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\vms_x_fix.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\vscroll.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\window.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\windowid.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\wizard.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\wrapsizer.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\wupdlock.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\wxhtml.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_all.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_animatctrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_bmp.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_bmpbt.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_bmpcbox.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_bttn.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_cald.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_chckb.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_chckl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_choic.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_choicbk.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_clrpicker.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_collpane.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_combo.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_datectrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_dirpicker.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_dlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_filepicker.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_fontpicker.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_frame.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_gauge.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_gdctl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_grid.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_html.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_htmllbox.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_hyperlink.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_listb.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_listbk.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_listc.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_mdi.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_menu.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_notbk.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_odcombo.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_panel.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_propdlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_radbt.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_radbx.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_scrol.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_scwin.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_sizer.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_slidr.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_spin.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_split.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_srchctrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_statbar.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_stbmp.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_stbox.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_stlin.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_sttxt.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_text.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_toolb.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_tree.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_treebk.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_unkwn.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_wizrd.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xmlres.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xpmdecod.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xpmhand.h"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc8_gl.vcproj b/build/msw/wx_vc8_gl.vcproj
index 7f52a7efab..dc82c75d50 100644
--- a/build/msw/wx_vc8_gl.vcproj
+++ b/build/msw/wx_vc8_gl.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,23 +43,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivudll\wxprec_gldll.pch"
AssemblerListingLocation="vc_mswunivudll\gl\"
@@ -67,23 +61,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_gl_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv29u_core.lib wxbase29u.lib opengl32.lib glu32.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv29u_core.lib wxbase29u.lib opengl32.lib glu32.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290u_gl_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_gl.lib"
@@ -97,6 +93,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -134,23 +133,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivuddll\wxprec_gldll.pch"
AssemblerListingLocation="vc_mswunivuddll\gl\"
@@ -158,23 +154,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_gl_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 wxmswuniv29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 wxmswuniv29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_gl_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_gl.lib"
@@ -188,6 +186,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -225,23 +226,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_gldll.pch"
AssemblerListingLocation="vc_mswudll\gl\"
@@ -249,23 +244,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_gl_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw29u_core.lib wxbase29u.lib opengl32.lib glu32.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw29u_core.lib wxbase29u.lib opengl32.lib glu32.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290u_gl_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29u_gl.lib"
@@ -279,6 +276,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -316,23 +316,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_gldll.pch"
AssemblerListingLocation="vc_mswuddll\gl\"
@@ -340,23 +337,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_gl_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 wxmsw29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 wxmsw29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290ud_gl_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_gl.lib"
@@ -370,6 +369,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -407,23 +409,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivu\wxprec_gllib.pch"
AssemblerListingLocation="vc_mswunivu\gl\"
@@ -431,15 +427,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_gl.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -452,6 +450,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -489,23 +490,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivud\wxprec_gllib.pch"
AssemblerListingLocation="vc_mswunivud\gl\"
@@ -513,15 +511,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_gl.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -534,6 +534,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -571,23 +574,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswu\wxprec_gllib.pch"
AssemblerListingLocation="vc_mswu\gl\"
@@ -595,15 +592,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_gl.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -616,6 +615,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -653,23 +655,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswud\wxprec_gllib.pch"
AssemblerListingLocation="vc_mswud\gl\"
@@ -677,15 +676,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_gl.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -698,6 +699,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -792,7 +796,8 @@
</File>
<File
RelativePath="..\..\src\common\glcmn.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="MSW Sources"
@@ -800,7 +805,8 @@
>
<File
RelativePath="..\..\src\msw\glcanvas.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\version.rc"
>
@@ -1045,7 +1051,8 @@
</File>
<File
RelativePath="..\..\include\wx\msw\glcanvas.h"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Common Headers"
@@ -1053,7 +1060,8 @@
>
<File
RelativePath="..\..\include\wx\glcanvas.h"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc8_html.vcproj b/build/msw/wx_vc8_html.vcproj
index b49495d6dd..2033bcaaca 100644
--- a/build/msw/wx_vc8_html.vcproj
+++ b/build/msw/wx_vc8_html.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,23 +43,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivudll\wxprec_htmldll.pch"
AssemblerListingLocation="vc_mswunivudll\html\"
@@ -67,23 +61,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_html_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290u_html_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_html.lib"
@@ -97,6 +93,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -134,23 +133,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivuddll\wxprec_htmldll.pch"
AssemblerListingLocation="vc_mswunivuddll\html\"
@@ -158,23 +154,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_html_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_html_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_html.lib"
@@ -188,6 +186,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -225,23 +226,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_htmldll.pch"
AssemblerListingLocation="vc_mswudll\html\"
@@ -249,23 +244,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_html_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290u_html_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29u_html.lib"
@@ -279,6 +276,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -316,23 +316,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_htmldll.pch"
AssemblerListingLocation="vc_mswuddll\html\"
@@ -340,23 +337,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_html_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290ud_html_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_html.lib"
@@ -370,6 +369,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -407,23 +409,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivu\wxprec_htmllib.pch"
AssemblerListingLocation="vc_mswunivu\html\"
@@ -431,15 +427,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_html.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -452,6 +450,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -489,23 +490,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivud\wxprec_htmllib.pch"
AssemblerListingLocation="vc_mswunivud\html\"
@@ -513,15 +511,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_html.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -534,6 +534,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -571,23 +574,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswu\wxprec_htmllib.pch"
AssemblerListingLocation="vc_mswu\html\"
@@ -595,15 +592,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_html.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -616,6 +615,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -653,23 +655,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswud\wxprec_htmllib.pch"
AssemblerListingLocation="vc_mswud\html\"
@@ -677,15 +676,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_html.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -698,6 +699,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -797,7 +801,8 @@
>
<File
RelativePath="..\..\src\msw\helpbest.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\version.rc"
>
@@ -825,7 +830,8 @@
>
<File
RelativePath="..\..\src\generic\htmllbox.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="wxHTML Sources"
@@ -833,70 +839,92 @@
>
<File
RelativePath="..\..\src\html\helpctrl.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\html\helpdata.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\html\helpdlg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\html\helpfrm.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\html\helpwnd.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\html\htmlcell.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\html\htmlfilt.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\html\htmlpars.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\html\htmltag.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\html\htmlwin.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\html\htmprint.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\html\m_dflist.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\html\m_fonts.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\html\m_hline.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\html\m_image.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\html\m_layout.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\html\m_links.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\html\m_list.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\html\m_pre.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\html\m_style.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\html\m_tables.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\html\winpars.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Setup Headers"
@@ -1121,7 +1149,8 @@
</File>
<File
RelativePath="..\..\include\wx\msw\helpbest.h"
- />
+ >
+ </File>
</Filter>
<Filter
Name="wxHTML Headers"
@@ -1129,49 +1158,64 @@
>
<File
RelativePath="..\..\include\wx\html\helpctrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\html\helpdata.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\html\helpdlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\html\helpfrm.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\html\helpwnd.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\html\htmlcell.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\html\htmldefs.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\html\htmlfilt.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\html\htmlpars.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\html\htmlproc.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\html\htmltag.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\html\htmlwin.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\html\htmprint.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\html\m_templ.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\html\winpars.h"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Common Headers"
@@ -1179,10 +1223,12 @@
>
<File
RelativePath="..\..\include\wx\htmllbox.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\wxhtml.h"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc8_media.vcproj b/build/msw/wx_vc8_media.vcproj
index 8c6e06139a..5a67fce880 100644
--- a/build/msw/wx_vc8_media.vcproj
+++ b/build/msw/wx_vc8_media.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,23 +43,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivudll\wxprec_mediadll.pch"
AssemblerListingLocation="vc_mswunivudll\media\"
@@ -67,23 +61,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_media_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290u_media_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_media.lib"
@@ -97,6 +93,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -134,23 +133,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivuddll\wxprec_mediadll.pch"
AssemblerListingLocation="vc_mswunivuddll\media\"
@@ -158,23 +154,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_media_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_media_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_media.lib"
@@ -188,6 +186,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -225,23 +226,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_mediadll.pch"
AssemblerListingLocation="vc_mswudll\media\"
@@ -249,23 +244,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_media_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290u_media_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29u_media.lib"
@@ -279,6 +276,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -316,23 +316,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_mediadll.pch"
AssemblerListingLocation="vc_mswuddll\media\"
@@ -340,23 +337,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_media_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290ud_media_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_media.lib"
@@ -370,6 +369,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -407,23 +409,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivu\wxprec_medialib.pch"
AssemblerListingLocation="vc_mswunivu\media\"
@@ -431,15 +427,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_media.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -452,6 +450,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -489,23 +490,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivud\wxprec_medialib.pch"
AssemblerListingLocation="vc_mswunivud\media\"
@@ -513,15 +511,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_media.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -534,6 +534,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -571,23 +574,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswu\wxprec_medialib.pch"
AssemblerListingLocation="vc_mswu\media\"
@@ -595,15 +592,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_media.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -616,6 +615,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -653,23 +655,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswud\wxprec_medialib.pch"
AssemblerListingLocation="vc_mswud\media\"
@@ -677,15 +676,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_media.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -698,6 +699,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -792,7 +796,8 @@
</File>
<File
RelativePath="..\..\src\common\mediactrlcmn.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="MSW Sources"
@@ -800,16 +805,20 @@
>
<File
RelativePath="..\..\src\msw\ole\activex.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\mediactrl_am.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\mediactrl_qt.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\mediactrl_wmp10.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\version.rc"
>
@@ -962,7 +971,8 @@
>
<File
RelativePath="..\..\include\wx\msw\ole\activex.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\msw\genrcdefs.h"
>
@@ -1062,7 +1072,8 @@
>
<File
RelativePath="..\..\include\wx\mediactrl.h"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc8_net.vcproj b/build/msw/wx_vc8_net.vcproj
index 126906270f..761bf3b8ca 100644
--- a/build/msw/wx_vc8_net.vcproj
+++ b/build/msw/wx_vc8_net.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,23 +43,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivudll\wxprec_netdll.pch"
AssemblerListingLocation="vc_mswunivudll\net\"
@@ -67,23 +61,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290u_net_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxbase290u_net_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase29u_net.lib"
@@ -97,6 +93,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -134,23 +133,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivuddll\wxprec_netdll.pch"
AssemblerListingLocation="vc_mswunivuddll\net\"
@@ -158,23 +154,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290ud_net_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxbase290ud_net_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase29ud_net.lib"
@@ -188,6 +186,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -225,23 +226,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_netdll.pch"
AssemblerListingLocation="vc_mswudll\net\"
@@ -249,23 +244,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290u_net_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxbase290u_net_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase29u_net.lib"
@@ -279,6 +276,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -316,23 +316,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_netdll.pch"
AssemblerListingLocation="vc_mswuddll\net\"
@@ -340,23 +337,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290ud_net_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxbase290ud_net_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase29ud_net.lib"
@@ -370,6 +369,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -407,23 +409,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivu\wxprec_netlib.pch"
AssemblerListingLocation="vc_mswunivu\net\"
@@ -431,15 +427,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29u_net.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -452,6 +450,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -489,23 +490,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivud\wxprec_netlib.pch"
AssemblerListingLocation="vc_mswunivud\net\"
@@ -513,15 +511,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29ud_net.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -534,6 +534,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -571,23 +574,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswu\wxprec_netlib.pch"
AssemblerListingLocation="vc_mswu\net\"
@@ -595,15 +592,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29u_net.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -616,6 +615,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -653,23 +655,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswud\wxprec_netlib.pch"
AssemblerListingLocation="vc_mswud\net\"
@@ -677,15 +676,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29ud_net.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -698,6 +699,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -792,34 +796,44 @@
</File>
<File
RelativePath="..\..\src\common\fs_inet.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\ftp.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\http.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\protocol.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\sckaddr.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\sckfile.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\sckipc.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\sckstrm.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\socket.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\url.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="MSW Sources"
@@ -827,13 +841,16 @@
>
<File
RelativePath="..\..\src\msw\gsocket.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\gsockmsw.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\urlmsw.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\msw\version.rc"
>
@@ -1078,7 +1095,8 @@
</File>
<File
RelativePath="..\..\include\wx\msw\gsockmsw.h"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Common Headers"
@@ -1086,37 +1104,48 @@
>
<File
RelativePath="..\..\include\wx\protocol\file.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\fs_inet.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\protocol\ftp.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\gsocket.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\protocol\http.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\protocol\protocol.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\sckaddr.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\sckipc.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\sckstrm.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\socket.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\url.h"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc8_propgrid.vcproj b/build/msw/wx_vc8_propgrid.vcproj
index 979e08e8e1..5a2a3cb23b 100644
--- a/build/msw/wx_vc8_propgrid.vcproj
+++ b/build/msw/wx_vc8_propgrid.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,23 +43,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivudll\wxprec_propgriddll.pch"
AssemblerListingLocation="vc_mswunivudll\propgrid\"
@@ -67,23 +61,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_propgrid_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290u_propgrid_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_propgrid.lib"
@@ -97,6 +93,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -134,23 +133,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivuddll\wxprec_propgriddll.pch"
AssemblerListingLocation="vc_mswunivuddll\propgrid\"
@@ -158,23 +154,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_propgrid_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_propgrid_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_propgrid.lib"
@@ -188,6 +186,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -225,23 +226,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_propgriddll.pch"
AssemblerListingLocation="vc_mswudll\propgrid\"
@@ -249,23 +244,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_propgrid_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290u_propgrid_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29u_propgrid.lib"
@@ -279,6 +276,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -316,23 +316,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_propgriddll.pch"
AssemblerListingLocation="vc_mswuddll\propgrid\"
@@ -340,23 +337,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_propgrid_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290ud_propgrid_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_propgrid.lib"
@@ -370,6 +369,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -407,23 +409,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivu\wxprec_propgridlib.pch"
AssemblerListingLocation="vc_mswunivu\propgrid\"
@@ -431,15 +427,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_propgrid.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -452,6 +450,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -489,23 +490,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivud\wxprec_propgridlib.pch"
AssemblerListingLocation="vc_mswunivud\propgrid\"
@@ -513,15 +511,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_propgrid.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -534,6 +534,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -571,23 +574,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswu\wxprec_propgridlib.pch"
AssemblerListingLocation="vc_mswu\propgrid\"
@@ -595,15 +592,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_propgrid.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -616,6 +615,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -653,23 +655,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswud\wxprec_propgridlib.pch"
AssemblerListingLocation="vc_mswud\propgrid\"
@@ -677,15 +676,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_propgrid.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -698,6 +699,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -1044,61 +1048,78 @@
>
<File
RelativePath="..\..\include\wx\propgrid\advprops.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\propgrid\editors.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\propgrid\manager.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\propgrid\property.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\propgrid\propgrid.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\propgrid\propgriddefs.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\propgrid\propgridiface.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\propgrid\propgridpagestate.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\propgrid\props.h"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\src\propgrid\advprops.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\propgrid\editors.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\propgrid\manager.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\propgrid\property.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\propgrid\propgrid.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\propgrid\propgridiface.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\propgrid\propgridpagestate.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\propgrid\props.cpp"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc8_qa.vcproj b/build/msw/wx_vc8_qa.vcproj
index 226ee13d38..99e8e208d6 100644
--- a/build/msw/wx_vc8_qa.vcproj
+++ b/build/msw/wx_vc8_qa.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,23 +43,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivudll\wxprec_qadll.pch"
AssemblerListingLocation="vc_mswunivudll\qa\"
@@ -67,23 +61,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_qa_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290u_qa_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_qa.lib"
@@ -97,6 +93,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -134,23 +133,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivuddll\wxprec_qadll.pch"
AssemblerListingLocation="vc_mswunivuddll\qa\"
@@ -158,23 +154,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_qa_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_qa_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_qa.lib"
@@ -188,6 +186,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -225,23 +226,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_qadll.pch"
AssemblerListingLocation="vc_mswudll\qa\"
@@ -249,23 +244,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_qa_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290u_qa_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29u_qa.lib"
@@ -279,6 +276,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -316,23 +316,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_qadll.pch"
AssemblerListingLocation="vc_mswuddll\qa\"
@@ -340,23 +337,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_qa_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290ud_qa_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_qa.lib"
@@ -370,6 +369,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -407,23 +409,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivu\wxprec_qalib.pch"
AssemblerListingLocation="vc_mswunivu\qa\"
@@ -431,15 +427,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_qa.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -452,6 +450,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -489,23 +490,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivud\wxprec_qalib.pch"
AssemblerListingLocation="vc_mswunivud\qa\"
@@ -513,15 +511,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_qa.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -534,6 +534,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -571,23 +574,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswu\wxprec_qalib.pch"
AssemblerListingLocation="vc_mswu\qa\"
@@ -595,15 +592,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_qa.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -616,6 +615,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -653,23 +655,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswud\wxprec_qalib.pch"
AssemblerListingLocation="vc_mswud\qa\"
@@ -677,15 +676,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_qa.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -698,6 +699,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -724,7 +728,8 @@
>
<File
RelativePath="..\..\src\common\debugrpt.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\common\dummy.cpp"
>
@@ -825,7 +830,8 @@
>
<File
RelativePath="..\..\src\generic\dbgrptg.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Setup Headers"
@@ -1055,7 +1061,8 @@
>
<File
RelativePath="..\..\include\wx\debugrpt.h"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc8_richtext.vcproj b/build/msw/wx_vc8_richtext.vcproj
index 59ed9b5658..5d56f261d6 100644
--- a/build/msw/wx_vc8_richtext.vcproj
+++ b/build/msw/wx_vc8_richtext.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,23 +43,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivudll\wxprec_richtextdll.pch"
AssemblerListingLocation="vc_mswunivudll\richtext\"
@@ -67,23 +61,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_richtext_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290u_richtext_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_richtext.lib"
@@ -97,6 +93,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -134,23 +133,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivuddll\wxprec_richtextdll.pch"
AssemblerListingLocation="vc_mswunivuddll\richtext\"
@@ -158,23 +154,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_richtext_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_richtext_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_richtext.lib"
@@ -188,6 +186,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -225,23 +226,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_richtextdll.pch"
AssemblerListingLocation="vc_mswudll\richtext\"
@@ -249,23 +244,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_richtext_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290u_richtext_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29u_richtext.lib"
@@ -279,6 +276,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -316,23 +316,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_richtextdll.pch"
AssemblerListingLocation="vc_mswuddll\richtext\"
@@ -340,23 +337,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_richtext_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290ud_richtext_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_richtext.lib"
@@ -370,6 +369,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -407,23 +409,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivu\wxprec_richtextlib.pch"
AssemblerListingLocation="vc_mswunivu\richtext\"
@@ -431,15 +427,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_richtext.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -452,6 +450,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -489,23 +490,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivud\wxprec_richtextlib.pch"
AssemblerListingLocation="vc_mswunivud\richtext\"
@@ -513,15 +511,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_richtext.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -534,6 +534,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -571,23 +574,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswu\wxprec_richtextlib.pch"
AssemblerListingLocation="vc_mswu\richtext\"
@@ -595,15 +592,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_richtext.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -616,6 +615,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -653,23 +655,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswud\wxprec_richtextlib.pch"
AssemblerListingLocation="vc_mswud\richtext\"
@@ -677,15 +676,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_richtext.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -698,6 +699,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -1044,64 +1048,82 @@
>
<File
RelativePath="..\..\include\wx\richtext\richtextbuffer.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\richtext\richtextctrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\richtext\richtextformatdlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\richtext\richtexthtml.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\richtext\richtextprint.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\richtext\richtextstyledlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\richtext\richtextstyles.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\richtext\richtextxml.h"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\src\richtext\richtextbuffer.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\richtext\richtextctrl.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\richtext\richtextformatdlg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\richtext\richtexthtml.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\richtext\richtextprint.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\richtext\richtextstyledlg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\richtext\richtextstyles.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\richtext\richtextsymboldlg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\richtext\richtextxml.cpp"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc8_stc.vcproj b/build/msw/wx_vc8_stc.vcproj
index 20c4f338d3..a23c335252 100644
--- a/build/msw/wx_vc8_stc.vcproj
+++ b/build/msw/wx_vc8_stc.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,23 +43,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivudll\wxprec_stcdll.pch"
AssemblerListingLocation="vc_mswunivudll\stc\"
@@ -67,23 +61,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_stc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290u_stc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_stc.lib"
@@ -97,6 +93,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -134,23 +133,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivuddll\wxprec_stcdll.pch"
AssemblerListingLocation="vc_mswunivuddll\stc\"
@@ -158,23 +154,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_stc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_stc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_stc.lib"
@@ -188,6 +186,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -225,23 +226,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_stcdll.pch"
AssemblerListingLocation="vc_mswudll\stc\"
@@ -249,23 +244,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_stc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290u_stc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29u_stc.lib"
@@ -279,6 +276,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -316,23 +316,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_stcdll.pch"
AssemblerListingLocation="vc_mswuddll\stc\"
@@ -340,23 +337,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_stc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290ud_stc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_stc.lib"
@@ -370,6 +369,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -407,23 +409,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivu\wxprec_stclib.pch"
AssemblerListingLocation="vc_mswunivu\stc\"
@@ -431,15 +427,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_stc.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -452,6 +450,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -489,23 +490,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivud\wxprec_stclib.pch"
AssemblerListingLocation="vc_mswunivud\stc\"
@@ -513,15 +511,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_stc.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -534,6 +534,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -571,23 +574,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswu\wxprec_stclib.pch"
AssemblerListingLocation="vc_mswu\stc\"
@@ -595,15 +592,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_stc.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -616,6 +615,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -653,23 +655,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswud\wxprec_stclib.pch"
AssemblerListingLocation="vc_mswud\stc\"
@@ -677,15 +676,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_stc.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -698,6 +699,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -1044,22 +1048,26 @@
>
<File
RelativePath="..\..\include\wx\stc\stc.h"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\src\stc\PlatWX.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\ScintillaWX.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\stc.cpp"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc8_wxexpat.vcproj b/build/msw/wx_vc8_wxexpat.vcproj
index c00b842aed..6ca922d224 100644
--- a/build/msw/wx_vc8_wxexpat.vcproj
+++ b/build/msw/wx_vc8_wxexpat.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -42,36 +42,32 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;COMPILED_FROM_DSP"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;COMPILED_FROM_DSP"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\wxexpat\"
ObjectFile="vc_mswunivudll\wxexpat\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxexpat.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="COMPILED_FROM_DSP"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll"
- PreprocessorDefinitions="COMPILED_FROM_DSP"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -84,6 +80,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -120,36 +119,35 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll"
+ PreprocessorDefinitions="_LIB;_DEBUG;COMPILED_FROM_DSP"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;COMPILED_FROM_DSP"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\wxexpat\"
ObjectFile="vc_mswunivuddll\wxexpat\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxexpatd.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll"
- PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -162,6 +160,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -198,36 +199,32 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;COMPILED_FROM_DSP"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;COMPILED_FROM_DSP"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\wxexpat\"
ObjectFile="vc_mswudll\wxexpat\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxexpat.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="COMPILED_FROM_DSP"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll"
- PreprocessorDefinitions="COMPILED_FROM_DSP"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -240,6 +237,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -276,36 +276,35 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll"
+ PreprocessorDefinitions="_LIB;_DEBUG;COMPILED_FROM_DSP"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;COMPILED_FROM_DSP"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\wxexpat\"
ObjectFile="vc_mswuddll\wxexpat\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxexpatd.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll"
- PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -318,6 +317,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -354,36 +356,32 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;COMPILED_FROM_DSP"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;COMPILED_FROM_DSP"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\wxexpat\"
ObjectFile="vc_mswunivu\wxexpat\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxexpat.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="COMPILED_FROM_DSP"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib"
- PreprocessorDefinitions="COMPILED_FROM_DSP"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -396,6 +394,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -432,36 +433,35 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib"
+ PreprocessorDefinitions="_LIB;_DEBUG;COMPILED_FROM_DSP"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;COMPILED_FROM_DSP"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\wxexpat\"
ObjectFile="vc_mswunivud\wxexpat\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxexpatd.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib"
- PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -474,6 +474,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -510,36 +513,32 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;COMPILED_FROM_DSP"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;COMPILED_FROM_DSP"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\wxexpat\"
ObjectFile="vc_mswu\wxexpat\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxexpat.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="COMPILED_FROM_DSP"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib"
- PreprocessorDefinitions="COMPILED_FROM_DSP"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -552,6 +551,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -588,36 +590,35 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib"
+ PreprocessorDefinitions="_LIB;_DEBUG;COMPILED_FROM_DSP"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;COMPILED_FROM_DSP"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\wxexpat\"
ObjectFile="vc_mswud\wxexpat\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxexpatd.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib"
- PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -630,6 +631,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -652,18 +656,21 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\src\expat\lib\xmlparse.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\expat\lib\xmlrole.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\expat\lib\xmltok.c"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc8_wxjpeg.vcproj b/build/msw/wx_vc8_wxjpeg.vcproj
index e819ea2c93..c987f3197d 100644
--- a/build/msw/wx_vc8_wxjpeg.vcproj
+++ b/build/msw/wx_vc8_wxjpeg.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -42,36 +42,32 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\wxjpeg\"
ObjectFile="vc_mswunivudll\wxjpeg\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpeg.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"
- PreprocessorDefinitions=""
/>
<Tool
Name="VCPreLinkEventTool"
@@ -84,6 +80,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -120,36 +119,35 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"
+ PreprocessorDefinitions="_LIB;_DEBUG"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\wxjpeg\"
ObjectFile="vc_mswunivuddll\wxjpeg\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpegd.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"
- PreprocessorDefinitions="_DEBUG"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -162,6 +160,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -198,36 +199,32 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\wxjpeg\"
ObjectFile="vc_mswudll\wxjpeg\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpeg.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"
- PreprocessorDefinitions=""
/>
<Tool
Name="VCPreLinkEventTool"
@@ -240,6 +237,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -276,36 +276,35 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"
+ PreprocessorDefinitions="_LIB;_DEBUG"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\wxjpeg\"
ObjectFile="vc_mswuddll\wxjpeg\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpegd.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"
- PreprocessorDefinitions="_DEBUG"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -318,6 +317,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -354,36 +356,32 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\wxjpeg\"
ObjectFile="vc_mswunivu\wxjpeg\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpeg.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"
- PreprocessorDefinitions=""
/>
<Tool
Name="VCPreLinkEventTool"
@@ -396,6 +394,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -432,36 +433,35 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"
+ PreprocessorDefinitions="_LIB;_DEBUG"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\wxjpeg\"
ObjectFile="vc_mswunivud\wxjpeg\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpegd.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"
- PreprocessorDefinitions="_DEBUG"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -474,6 +474,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -510,36 +513,32 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\wxjpeg\"
ObjectFile="vc_mswu\wxjpeg\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpeg.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"
- PreprocessorDefinitions=""
/>
<Tool
Name="VCPreLinkEventTool"
@@ -552,6 +551,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -588,36 +590,35 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"
+ PreprocessorDefinitions="_LIB;_DEBUG"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\wxjpeg\"
ObjectFile="vc_mswud\wxjpeg\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpegd.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"
- PreprocessorDefinitions="_DEBUG"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -630,6 +631,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -652,147 +656,193 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\src\jpeg\jcapimin.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jcapistd.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jccoefct.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jccolor.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jcdctmgr.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jchuff.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jcinit.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jcmainct.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jcmarker.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jcmaster.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jcomapi.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jcparam.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jcphuff.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jcprepct.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jcsample.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jctrans.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jdapimin.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jdapistd.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jdatadst.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jdatasrc.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jdcoefct.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jdcolor.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jddctmgr.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jdhuff.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jdinput.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jdmainct.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jdmarker.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jdmaster.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jdmerge.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jdphuff.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jdpostct.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jdsample.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jdtrans.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jerror.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jfdctflt.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jfdctfst.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jfdctint.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jidctflt.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jidctfst.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jidctint.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jidctred.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jmemmgr.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jmemnobs.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jquant1.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jquant2.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\jpeg\jutils.c"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc8_wxpng.vcproj b/build/msw/wx_vc8_wxpng.vcproj
index 50c4937a31..99dc24da22 100644
--- a/build/msw/wx_vc8_wxpng.vcproj
+++ b/build/msw/wx_vc8_wxpng.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -42,36 +42,32 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\zlib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\wxpng\"
ObjectFile="vc_mswunivudll\wxpng\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxpng.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
Culture="1033"
AdditionalIncludeDirectories="..\..\src\zlib"
- PreprocessorDefinitions=""
/>
<Tool
Name="VCPreLinkEventTool"
@@ -84,6 +80,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -120,36 +119,35 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\zlib"
+ PreprocessorDefinitions="_LIB;_DEBUG"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\wxpng\"
ObjectFile="vc_mswunivuddll\wxpng\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxpngd.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
Culture="1033"
AdditionalIncludeDirectories="..\..\src\zlib"
- PreprocessorDefinitions="_DEBUG"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -162,6 +160,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -198,36 +199,32 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\zlib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\wxpng\"
ObjectFile="vc_mswudll\wxpng\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxpng.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
Culture="1033"
AdditionalIncludeDirectories="..\..\src\zlib"
- PreprocessorDefinitions=""
/>
<Tool
Name="VCPreLinkEventTool"
@@ -240,6 +237,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -276,36 +276,35 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\zlib"
+ PreprocessorDefinitions="_LIB;_DEBUG"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\wxpng\"
ObjectFile="vc_mswuddll\wxpng\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxpngd.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
Culture="1033"
AdditionalIncludeDirectories="..\..\src\zlib"
- PreprocessorDefinitions="_DEBUG"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -318,6 +317,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -354,36 +356,32 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\zlib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\wxpng\"
ObjectFile="vc_mswunivu\wxpng\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxpng.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
Culture="1033"
AdditionalIncludeDirectories="..\..\src\zlib"
- PreprocessorDefinitions=""
/>
<Tool
Name="VCPreLinkEventTool"
@@ -396,6 +394,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -432,36 +433,35 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\zlib"
+ PreprocessorDefinitions="_LIB;_DEBUG"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\wxpng\"
ObjectFile="vc_mswunivud\wxpng\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxpngd.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
Culture="1033"
AdditionalIncludeDirectories="..\..\src\zlib"
- PreprocessorDefinitions="_DEBUG"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -474,6 +474,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -510,36 +513,32 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\zlib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\wxpng\"
ObjectFile="vc_mswu\wxpng\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxpng.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
Culture="1033"
AdditionalIncludeDirectories="..\..\src\zlib"
- PreprocessorDefinitions=""
/>
<Tool
Name="VCPreLinkEventTool"
@@ -552,6 +551,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -588,36 +590,35 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\zlib"
+ PreprocessorDefinitions="_LIB;_DEBUG"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\wxpng\"
ObjectFile="vc_mswud\wxpng\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxpngd.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
Culture="1033"
AdditionalIncludeDirectories="..\..\src\zlib"
- PreprocessorDefinitions="_DEBUG"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -630,6 +631,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -652,60 +656,77 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\src\png\png.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\png\pngerror.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\png\pnggccrd.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\png\pngget.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\png\pngmem.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\png\pngpread.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\png\pngread.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\png\pngrio.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\png\pngrtran.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\png\pngrutil.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\png\pngset.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\png\pngtrans.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\png\pngvcrd.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\png\pngwio.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\png\pngwrite.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\png\pngwtran.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\png\pngwutil.c"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc8_wxregex.vcproj b/build/msw/wx_vc8_wxregex.vcproj
index 0b13634361..82410cb0a4 100644
--- a/build/msw/wx_vc8_wxregex.vcproj
+++ b/build/msw/wx_vc8_wxregex.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,36 +43,32 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\wxregex\"
ObjectFile="vc_mswunivudll\wxregex\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxregexu.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE"
Culture="1033"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -85,6 +81,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -122,36 +121,35 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\wxregex\"
ObjectFile="vc_mswunivuddll\wxregex\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxregexud.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
Culture="1033"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -164,6 +162,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -201,36 +202,32 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\wxregex\"
ObjectFile="vc_mswudll\wxregex\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxregexu.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE"
Culture="1033"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"
- PreprocessorDefinitions="__WXMSW__;_UNICODE"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -243,6 +240,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -280,36 +280,35 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;_UNICODE"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;_UNICODE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\wxregex\"
ObjectFile="vc_mswuddll\wxregex\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxregexud.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE"
Culture="1033"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -322,6 +321,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -359,36 +361,32 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\wxregex\"
ObjectFile="vc_mswunivu\wxregex\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxregexu.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE"
Culture="1033"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -401,6 +399,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -438,36 +439,35 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\wxregex\"
ObjectFile="vc_mswunivud\wxregex\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxregexud.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
Culture="1033"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -480,6 +480,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -517,36 +520,32 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\wxregex\"
ObjectFile="vc_mswu\wxregex\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxregexu.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE"
Culture="1033"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"
- PreprocessorDefinitions="__WXMSW__;_UNICODE"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -559,6 +558,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -596,36 +598,35 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;_UNICODE"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;_UNICODE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\wxregex\"
ObjectFile="vc_mswud\wxregex\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxregexud.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE"
Culture="1033"
AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -638,6 +639,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -660,26 +664,30 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\src\regex\regcomp.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\regex\regerror.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\regex\regexec.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\regex\regfree.c"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Header Files"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath="..\..\include\wx\msw\genrcdefs.h"
diff --git a/build/msw/wx_vc8_wxscintilla.vcproj b/build/msw/wx_vc8_wxscintilla.vcproj
index 5a19fd6ee9..e1146bfae5 100644
--- a/build/msw/wx_vc8_wxscintilla.vcproj
+++ b/build/msw/wx_vc8_wxscintilla.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -42,36 +42,32 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WX__;SCI_LEXER;LINK_LEXERS"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WX__;SCI_LEXER;LINK_LEXERS"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\wxscintilla\"
ObjectFile="vc_mswunivudll\wxscintilla\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintilla.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"
Culture="1033"
AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -84,6 +80,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -120,36 +119,35 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\wxscintilla\"
ObjectFile="vc_mswunivuddll\wxscintilla\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintillad.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
Culture="1033"
AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -162,6 +160,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -198,36 +199,32 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WX__;SCI_LEXER;LINK_LEXERS"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WX__;SCI_LEXER;LINK_LEXERS"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\wxscintilla\"
ObjectFile="vc_mswudll\wxscintilla\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintilla.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"
Culture="1033"
AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -240,6 +237,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -276,36 +276,35 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\wxscintilla\"
ObjectFile="vc_mswuddll\wxscintilla\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintillad.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
Culture="1033"
AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -318,6 +317,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -354,36 +356,32 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WX__;SCI_LEXER;LINK_LEXERS"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WX__;SCI_LEXER;LINK_LEXERS"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\wxscintilla\"
ObjectFile="vc_mswunivu\wxscintilla\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintilla.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"
Culture="1033"
AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -396,6 +394,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -432,36 +433,35 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\wxscintilla\"
ObjectFile="vc_mswunivud\wxscintilla\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintillad.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
Culture="1033"
AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -474,6 +474,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -510,36 +513,32 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WX__;SCI_LEXER;LINK_LEXERS"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WX__;SCI_LEXER;LINK_LEXERS"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\wxscintilla\"
ObjectFile="vc_mswu\wxscintilla\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintilla.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"
Culture="1033"
AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -552,6 +551,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -588,36 +590,35 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\wxscintilla\"
ObjectFile="vc_mswud\wxscintilla\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintillad.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
Culture="1033"
AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -630,6 +631,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -652,285 +656,377 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\src\stc\scintilla\src\AutoComplete.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\CallTip.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\CellBuffer.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\CharClassify.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\ContractionState.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\Decoration.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\Document.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\DocumentAccessor.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\Editor.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\ExternalLexer.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\Indicator.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\KeyMap.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\KeyWords.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexAPDL.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexASY.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexAU3.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexAVE.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexAbaqus.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexAda.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexAsm.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexAsn1.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexBaan.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexBash.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexBasic.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexBullant.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexCLW.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexCPP.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexCSS.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexCaml.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexCmake.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexConf.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexCrontab.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexCsound.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexD.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexEScript.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexEiffel.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexErlang.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexFlagship.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexForth.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexFortran.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexGAP.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexGui4Cli.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexHTML.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexHaskell.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexInno.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexKix.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexLisp.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexLout.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexLua.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexMMIXAL.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexMPT.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexMSSQL.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexMatlab.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexMetapost.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexNsis.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexOpal.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexOthers.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexPB.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexPLM.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexPOV.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexPS.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexPascal.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexPerl.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexProgress.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexPython.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexR.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexRebol.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexRuby.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexSQL.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexScriptol.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexSmalltalk.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexSpecman.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexSpice.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexTADS3.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexTCL.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexTeX.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexVB.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexVHDL.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexVerilog.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LexYAML.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\LineMarker.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\PositionCache.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\PropSet.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\RESearch.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\RunStyles.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\ScintillaBase.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\Style.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\StyleContext.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\UniConversion.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\ViewStyle.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\WindowAccessor.cxx"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\stc\scintilla\src\XPM.cxx"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc8_wxtiff.vcproj b/build/msw/wx_vc8_wxtiff.vcproj
index db76bf6c22..10325021b8 100644
--- a/build/msw/wx_vc8_wxtiff.vcproj
+++ b/build/msw/wx_vc8_wxtiff.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -42,36 +42,32 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\wxtiff\"
ObjectFile="vc_mswunivudll\wxtiff\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxtiff.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
Culture="1033"
AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
- PreprocessorDefinitions=""
/>
<Tool
Name="VCPreLinkEventTool"
@@ -84,6 +80,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -120,36 +119,35 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
+ PreprocessorDefinitions="_LIB;_DEBUG"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\wxtiff\"
ObjectFile="vc_mswunivuddll\wxtiff\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxtiffd.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
Culture="1033"
AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
- PreprocessorDefinitions="_DEBUG"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -162,6 +160,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -198,36 +199,32 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\wxtiff\"
ObjectFile="vc_mswudll\wxtiff\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxtiff.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
Culture="1033"
AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
- PreprocessorDefinitions=""
/>
<Tool
Name="VCPreLinkEventTool"
@@ -240,6 +237,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -276,36 +276,35 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
+ PreprocessorDefinitions="_LIB;_DEBUG"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\wxtiff\"
ObjectFile="vc_mswuddll\wxtiff\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxtiffd.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
Culture="1033"
AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
- PreprocessorDefinitions="_DEBUG"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -318,6 +317,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -354,36 +356,32 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\wxtiff\"
ObjectFile="vc_mswunivu\wxtiff\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxtiff.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
Culture="1033"
AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
- PreprocessorDefinitions=""
/>
<Tool
Name="VCPreLinkEventTool"
@@ -396,6 +394,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -432,36 +433,35 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
+ PreprocessorDefinitions="_LIB;_DEBUG"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\wxtiff\"
ObjectFile="vc_mswunivud\wxtiff\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxtiffd.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
Culture="1033"
AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
- PreprocessorDefinitions="_DEBUG"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -474,6 +474,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -510,36 +513,32 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\wxtiff\"
ObjectFile="vc_mswu\wxtiff\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxtiff.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
Culture="1033"
AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
- PreprocessorDefinitions=""
/>
<Tool
Name="VCPreLinkEventTool"
@@ -552,6 +551,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -588,36 +590,35 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
+ PreprocessorDefinitions="_LIB;_DEBUG"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\wxtiff\"
ObjectFile="vc_mswud\wxtiff\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxtiffd.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
Culture="1033"
AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
- PreprocessorDefinitions="_DEBUG"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -630,6 +631,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -652,117 +656,153 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\src\tiff\libtiff\tif_aux.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_close.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_codec.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_color.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_compress.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_dir.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_dirinfo.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_dirread.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_dirwrite.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_dumpmode.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_error.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_extension.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_fax3.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_fax3sm.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_flush.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_getimage.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_jpeg.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_luv.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_lzw.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_next.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_ojpeg.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_open.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_packbits.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_pixarlog.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_predict.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_print.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_read.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_strip.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_swab.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_thunder.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_tile.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_version.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_warning.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_win32.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_write.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_zip.c"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc8_wxzlib.vcproj b/build/msw/wx_vc8_wxzlib.vcproj
index f4d5b55310..a384c7aa73 100644
--- a/build/msw/wx_vc8_wxzlib.vcproj
+++ b/build/msw/wx_vc8_wxzlib.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -42,36 +42,32 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=""
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\wxzlib\"
ObjectFile="vc_mswunivudll\wxzlib\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxzlib.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
Culture="1033"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
/>
<Tool
Name="VCPreLinkEventTool"
@@ -84,6 +80,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -120,36 +119,35 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_LIB;_DEBUG"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\wxzlib\"
ObjectFile="vc_mswunivuddll\wxzlib\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxzlibd.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
Culture="1033"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -162,6 +160,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -198,36 +199,32 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=""
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\wxzlib\"
ObjectFile="vc_mswudll\wxzlib\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxzlib.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
Culture="1033"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
/>
<Tool
Name="VCPreLinkEventTool"
@@ -240,6 +237,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -276,36 +276,35 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_LIB;_DEBUG"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\wxzlib\"
ObjectFile="vc_mswuddll\wxzlib\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxzlibd.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
Culture="1033"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -318,6 +317,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -354,36 +356,32 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=""
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\wxzlib\"
ObjectFile="vc_mswunivu\wxzlib\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxzlib.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
Culture="1033"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
/>
<Tool
Name="VCPreLinkEventTool"
@@ -396,6 +394,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -432,36 +433,35 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_LIB;_DEBUG"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\wxzlib\"
ObjectFile="vc_mswunivud\wxzlib\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxzlibd.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
Culture="1033"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -474,6 +474,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -510,36 +513,32 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=""
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\wxzlib\"
ObjectFile="vc_mswu\wxzlib\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxzlib.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
Culture="1033"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
/>
<Tool
Name="VCPreLinkEventTool"
@@ -552,6 +551,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -588,36 +590,35 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_LIB;_DEBUG"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\wxzlib\"
ObjectFile="vc_mswud\wxzlib\"
ProgramDataBaseFileName="..\..\lib\vc_lib\wxzlibd.pdb"
- WarningLevel="1"
+ WarningLevel="3"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
Culture="1033"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -630,6 +631,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -652,45 +656,57 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\src\zlib\adler32.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\zlib\compress.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\zlib\crc32.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\zlib\deflate.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\zlib\gzio.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\zlib\infback.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\zlib\inffast.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\zlib\inflate.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\zlib\inftrees.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\zlib\trees.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\zlib\uncompr.c"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\zlib\zutil.c"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc8_xml.vcproj b/build/msw/wx_vc8_xml.vcproj
index 7672dc6f6d..093cb4eef6 100644
--- a/build/msw/wx_vc8_xml.vcproj
+++ b/build/msw/wx_vc8_xml.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,23 +43,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivudll\wxprec_xmldll.pch"
AssemblerListingLocation="vc_mswunivudll\xml\"
@@ -67,23 +61,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290u_xml_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxbase290u_xml_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase29u_xml.lib"
@@ -97,6 +93,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -134,23 +133,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivuddll\wxprec_xmldll.pch"
AssemblerListingLocation="vc_mswunivuddll\xml\"
@@ -158,23 +154,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290ud_xml_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxbase290ud_xml_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase29ud_xml.lib"
@@ -188,6 +186,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -225,23 +226,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_xmldll.pch"
AssemblerListingLocation="vc_mswudll\xml\"
@@ -249,23 +244,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290u_xml_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxbase290u_xml_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase29u_xml.lib"
@@ -279,6 +276,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -316,23 +316,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_xmldll.pch"
AssemblerListingLocation="vc_mswuddll\xml\"
@@ -340,23 +337,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290ud_xml_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxbase290ud_xml_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase29ud_xml.lib"
@@ -370,6 +369,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -407,23 +409,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivu\wxprec_xmllib.pch"
AssemblerListingLocation="vc_mswunivu\xml\"
@@ -431,15 +427,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29u_xml.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -452,6 +450,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -489,23 +490,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivud\wxprec_xmllib.pch"
AssemblerListingLocation="vc_mswunivud\xml\"
@@ -513,15 +511,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29ud_xml.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -534,6 +534,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -571,23 +574,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswu\wxprec_xmllib.pch"
AssemblerListingLocation="vc_mswu\xml\"
@@ -595,15 +592,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29u_xml.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -616,6 +615,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -653,23 +655,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswud\wxprec_xmllib.pch"
AssemblerListingLocation="vc_mswud\xml\"
@@ -677,15 +676,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29ud_xml.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -698,6 +699,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -792,7 +796,8 @@
</File>
<File
RelativePath="..\..\src\common\xtixml.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="MSW Sources"
@@ -1047,19 +1052,22 @@
>
<File
RelativePath="..\..\include\wx\xml\xml.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xtixml.h"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\src\xml\xml.cpp"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/build/msw/wx_vc8_xrc.vcproj b/build/msw/wx_vc8_xrc.vcproj
index 613fdff985..f6da71ee5c 100644
--- a/build/msw/wx_vc8_xrc.vcproj
+++ b/build/msw/wx_vc8_xrc.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,23 +43,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivudll\wxprec_xrcdll.pch"
AssemblerListingLocation="vc_mswunivudll\xrc\"
@@ -67,23 +61,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_xrc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290u_xrc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_xrc.lib"
@@ -97,6 +93,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -134,23 +133,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivuddll\wxprec_xrcdll.pch"
AssemblerListingLocation="vc_mswunivuddll\xrc\"
@@ -158,23 +154,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_xrc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_xrc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_xrc.lib"
@@ -188,6 +186,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -225,23 +226,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_xrcdll.pch"
AssemblerListingLocation="vc_mswudll\xrc\"
@@ -249,23 +244,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_xrc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib"
AdditionalOptions=""
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290u_xrc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29u_xrc.lib"
@@ -279,6 +276,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -316,23 +316,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_xrcdll.pch"
AssemblerListingLocation="vc_mswuddll\xrc\"
@@ -340,23 +337,25 @@
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_xrc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib"
AdditionalOptions=""
+ AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw290ud_xrc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_xrc.lib"
@@ -370,6 +369,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -407,23 +409,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivu\wxprec_xrclib.pch"
AssemblerListingLocation="vc_mswunivu\xrc\"
@@ -431,15 +427,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_xrc.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -452,6 +450,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -489,23 +490,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivud\wxprec_xrclib.pch"
AssemblerListingLocation="vc_mswunivud\xrc\"
@@ -513,15 +511,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_xrc.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -534,6 +534,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -571,23 +574,17 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswu\wxprec_xrclib.pch"
AssemblerListingLocation="vc_mswu\xrc\"
@@ -595,15 +592,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_xrc.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -616,6 +615,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -653,23 +655,20 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswud\wxprec_xrclib.pch"
AssemblerListingLocation="vc_mswud\xrc\"
@@ -677,15 +676,17 @@
ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_xrc.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -698,6 +699,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -1044,355 +1048,470 @@
>
<File
RelativePath="..\..\include\wx\xrc\xh_all.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_animatctrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_bmp.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_bmpbt.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_bmpcbox.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_bttn.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_cald.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_chckb.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_chckl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_choic.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_choicbk.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_clrpicker.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_collpane.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_combo.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_datectrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_dirpicker.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_dlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_filepicker.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_fontpicker.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_frame.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_gauge.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_gdctl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_grid.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_html.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_htmllbox.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_hyperlink.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_listb.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_listbk.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_listc.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_mdi.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_menu.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_notbk.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_odcombo.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_panel.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_propdlg.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_radbt.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_radbx.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_scrol.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_scwin.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_sizer.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_slidr.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_spin.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_split.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_srchctrl.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_statbar.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_stbmp.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_stbox.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_stlin.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_sttxt.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_text.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_toolb.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_tree.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_treebk.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_unkwn.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xh_wizrd.h"
- />
+ >
+ </File>
<File
RelativePath="..\..\include\wx\xrc\xmlres.h"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\src\xrc\xh_animatctrl.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_bmp.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_bmpbt.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_bmpcbox.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_bttn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_cald.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_chckb.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_chckl.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_choic.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_choicbk.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_clrpicker.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_collpane.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_combo.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_datectrl.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_dirpicker.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_dlg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_filepicker.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_fontpicker.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_frame.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_gauge.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_gdctl.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_grid.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_html.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_htmllbox.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_hyperlink.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_listb.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_listbk.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_listc.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_mdi.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_menu.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_notbk.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_odcombo.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_panel.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_propdlg.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_radbt.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_radbx.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_scrol.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_scwin.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_sizer.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_slidr.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_spin.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_split.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_srchctrl.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_statbar.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_stbmp.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_stbox.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_stlin.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_sttxt.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_text.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_tglbtn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_toolb.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_tree.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_treebk.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_unkwn.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xh_wizrd.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xmladv.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xmlres.cpp"
- />
+ >
+ </File>
<File
RelativePath="..\..\src\xrc\xmlrsall.cpp"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in
index 4aa89d52d4..cfa5f6c154 100644
--- a/samples/access/Makefile.in
+++ b/samples/access/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ ACCESSTEST_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: accesstest$(EXEEXT) $(__accesstest_bundle___depname)
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
accesstest$(EXEEXT): $(ACCESSTEST_OBJECTS) $(__accesstest___win32rc)
- $(CXX) -o $@ $(ACCESSTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(ACCESSTEST_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)
$(__accesstest___mac_setfilecmd)
$(__accesstest___os2_emxbindcmd)
@@ -192,6 +192,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean accesstest_bundle
diff --git a/samples/access/access_vc7.vcproj b/samples/access/access_vc7.vcproj
index 63aa610479..578ee39e7b 100644
--- a/samples/access/access_vc7.vcproj
+++ b/samples/access/access_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\accesstest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\accesstest\"
ObjectFile="vc_mswunivudll\accesstest\"
ProgramDataBaseFileName="vc_mswunivudll\accesstest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\accesstest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\accesstest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\access_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\accesstest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\accesstest\"
ObjectFile="vc_mswunivuddll\accesstest\"
ProgramDataBaseFileName="vc_mswunivuddll\accesstest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\accesstest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\accesstest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\access_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\accesstest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\accesstest\"
ObjectFile="vc_mswudll\accesstest\"
ProgramDataBaseFileName="vc_mswudll\accesstest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\accesstest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\accesstest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\access_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\accesstest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\accesstest\"
ObjectFile="vc_mswuddll\accesstest\"
ProgramDataBaseFileName="vc_mswuddll\accesstest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\accesstest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\accesstest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\access_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\accesstest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\accesstest\"
ObjectFile="vc_mswunivu\accesstest\"
ProgramDataBaseFileName="vc_mswunivu\accesstest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\accesstest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\accesstest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\access_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\accesstest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\accesstest\"
ObjectFile="vc_mswunivud\accesstest\"
ProgramDataBaseFileName="vc_mswunivud\accesstest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\accesstest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\accesstest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\access_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\accesstest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\accesstest\"
ObjectFile="vc_mswu\accesstest\"
ProgramDataBaseFileName="vc_mswu\accesstest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\accesstest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\accesstest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\access_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\accesstest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\accesstest\"
ObjectFile="vc_mswud\accesstest\"
ProgramDataBaseFileName="vc_mswud\accesstest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\accesstest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\accesstest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\access_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\accesstest.cpp"/>
+ RelativePath=".\accesstest.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\accesstest.rc"/>
+ RelativePath=".\accesstest.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/access/access_vc8.vcproj b/samples/access/access_vc8.vcproj
index db28422698..35ae55395e 100644
--- a/samples/access/access_vc8.vcproj
+++ b/samples/access/access_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\accesstest\"
ObjectFile="vc_mswunivudll\accesstest\"
ProgramDataBaseFileName="vc_mswunivudll\accesstest.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\accesstest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\accesstest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\accesstest\"
ObjectFile="vc_mswunivuddll\accesstest\"
ProgramDataBaseFileName="vc_mswunivuddll\accesstest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\accesstest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\accesstest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\accesstest\"
ObjectFile="vc_mswudll\accesstest\"
ProgramDataBaseFileName="vc_mswudll\accesstest.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\accesstest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\accesstest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\accesstest\"
ObjectFile="vc_mswuddll\accesstest\"
ProgramDataBaseFileName="vc_mswuddll\accesstest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\accesstest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\accesstest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\accesstest\"
ObjectFile="vc_mswunivu\accesstest\"
ProgramDataBaseFileName="vc_mswunivu\accesstest.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\accesstest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\accesstest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\accesstest\"
ObjectFile="vc_mswunivud\accesstest\"
ProgramDataBaseFileName="vc_mswunivud\accesstest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\accesstest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\accesstest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\accesstest\"
ObjectFile="vc_mswu\accesstest\"
ProgramDataBaseFileName="vc_mswu\accesstest.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\accesstest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\accesstest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\accesstest\"
ObjectFile="vc_mswud\accesstest\"
ProgramDataBaseFileName="vc_mswud\accesstest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\accesstest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\accesstest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\accesstest.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\accesstest.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/access/makefile.bcc b/samples/access/makefile.bcc
index bc8f11419c..ea9ac2f315 100644
--- a/samples/access/makefile.bcc
+++ b/samples/access/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\accesstest.ils del $(OBJS)\accesstest.ils
$(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/access/makefile.gcc b/samples/access/makefile.gcc
index 7fdc77b147..858699106b 100644
--- a/samples/access/makefile.gcc
+++ b/samples/access/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\accesstest.exe del $(OBJS)\accesstest.exe
$(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest_rc.o
- $(CXX) -o $@ $(ACCESSTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(OBJS)\accesstest_accesstest.o: ./accesstest.cpp
$(CXX) -c -o $@ $(ACCESSTEST_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/access/makefile.unx b/samples/access/makefile.unx
index c0485686c0..9e47a9aeec 100644
--- a/samples/access/makefile.unx
+++ b/samples/access/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild accesstest
-install: all
+install:
uninstall:
diff --git a/samples/access/makefile.vc b/samples/access/makefile.vc
index 8ee944e85a..f746fd1362 100644
--- a/samples/access/makefile.vc
+++ b/samples/access/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\accesstest.pdb del $(OBJS)\accesstest.pdb
$(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\accesstest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\accesstest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/access/makefile.wat b/samples/access/makefile.wat
index 32b98cb539..c3044e4a30 100644
--- a/samples/access/makefile.wat
+++ b/samples/access/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\accesstest.exe : $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest.re
@%append $(OBJS)\accesstest.lbc option quiet
@%append $(OBJS)\accesstest.lbc name $^@
@%append $(OBJS)\accesstest.lbc option caseexact
- @%append $(OBJS)\accesstest.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\accesstest.lbc library %i
@%append $(OBJS)\accesstest.lbc option resource=$(OBJS)\accesstest_accesstest.res
diff --git a/samples/animate/Makefile.in b/samples/animate/Makefile.in
index 447389130c..84524970ac 100644
--- a/samples/animate/Makefile.in
+++ b/samples/animate/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -61,7 +61,7 @@ ANITEST_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -115,28 +115,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: anitest$(EXEEXT) $(__anitest_bundle___depname) catalog
-install: all
+install:
uninstall:
@@ -152,7 +152,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
anitest$(EXEEXT): $(ANITEST_OBJECTS) $(__anitest___win32rc)
- $(CXX) -o $@ $(ANITEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
+ $(CXX) -o $@ $(ANITEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
$(__anitest___mac_setfilecmd)
$(__anitest___os2_emxbindcmd)
@@ -209,6 +209,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean anitest_bundle catalog
diff --git a/samples/animate/anitest_vc7.vcproj b/samples/animate/anitest_vc7.vcproj
index dc9bbd74aa..3ac3a041d5 100644
--- a/samples/animate/anitest_vc7.vcproj
+++ b/samples/animate/anitest_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\anitest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\anitest\"
ObjectFile="vc_mswunivudll\anitest\"
ProgramDataBaseFileName="vc_mswunivudll\anitest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\anitest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\anitest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\anitest_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\anitest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\anitest\"
ObjectFile="vc_mswunivuddll\anitest\"
ProgramDataBaseFileName="vc_mswunivuddll\anitest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivuddll\anitest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\anitest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\anitest_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\anitest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\anitest\"
ObjectFile="vc_mswudll\anitest\"
ProgramDataBaseFileName="vc_mswudll\anitest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\anitest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\anitest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\anitest_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\anitest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\anitest\"
ObjectFile="vc_mswuddll\anitest\"
ProgramDataBaseFileName="vc_mswuddll\anitest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswuddll\anitest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\anitest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\anitest_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\anitest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\anitest\"
ObjectFile="vc_mswunivu\anitest\"
ProgramDataBaseFileName="vc_mswunivu\anitest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\anitest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\anitest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\anitest_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\anitest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\anitest\"
ObjectFile="vc_mswunivud\anitest\"
ProgramDataBaseFileName="vc_mswunivud\anitest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivud\anitest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\anitest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\anitest_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\anitest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\anitest\"
ObjectFile="vc_mswu\anitest\"
ProgramDataBaseFileName="vc_mswu\anitest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\anitest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\anitest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\anitest_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\anitest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\anitest\"
ObjectFile="vc_mswud\anitest\"
ProgramDataBaseFileName="vc_mswud\anitest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswud\anitest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\anitest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\anitest_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\anitest.cpp"/>
+ RelativePath=".\anitest.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\..\sample.rc"/>
+ RelativePath=".\..\sample.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/animate/anitest_vc8.vcproj b/samples/animate/anitest_vc8.vcproj
index afedec916a..eb7e90a979 100644
--- a/samples/animate/anitest_vc8.vcproj
+++ b/samples/animate/anitest_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\anitest\"
ObjectFile="vc_mswunivudll\anitest\"
ProgramDataBaseFileName="vc_mswunivudll\anitest.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\anitest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\anitest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\anitest\"
ObjectFile="vc_mswunivuddll\anitest\"
ProgramDataBaseFileName="vc_mswunivuddll\anitest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivuddll\anitest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\anitest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\anitest\"
ObjectFile="vc_mswudll\anitest\"
ProgramDataBaseFileName="vc_mswudll\anitest.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\anitest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\anitest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\anitest\"
ObjectFile="vc_mswuddll\anitest\"
ProgramDataBaseFileName="vc_mswuddll\anitest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswuddll\anitest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\anitest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\anitest\"
ObjectFile="vc_mswunivu\anitest\"
ProgramDataBaseFileName="vc_mswunivu\anitest.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\anitest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\anitest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\anitest\"
ObjectFile="vc_mswunivud\anitest\"
ProgramDataBaseFileName="vc_mswunivud\anitest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivud\anitest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\anitest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\anitest\"
ObjectFile="vc_mswu\anitest\"
ProgramDataBaseFileName="vc_mswu\anitest.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\anitest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\anitest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\anitest\"
ObjectFile="vc_mswud\anitest\"
ProgramDataBaseFileName="vc_mswud\anitest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswud\anitest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\anitest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\anitest.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\..\sample.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/animate/makefile.bcc b/samples/animate/makefile.bcc
index 05a32375f3..72fc96a604 100644
--- a/samples/animate/makefile.bcc
+++ b/samples/animate/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -233,7 +233,7 @@ clean:
-if exist $(OBJS)\anitest.ils del $(OBJS)\anitest.ils
$(OBJS)\anitest.exe: $(ANITEST_OBJECTS) $(OBJS)\anitest_sample.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/animate/makefile.gcc b/samples/animate/makefile.gcc
index 801a4e5752..b8e7a15459 100644
--- a/samples/animate/makefile.gcc
+++ b/samples/animate/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -228,7 +228,7 @@ clean:
-if exist $(OBJS)\anitest.exe del $(OBJS)\anitest.exe
$(OBJS)\anitest.exe: $(ANITEST_OBJECTS) $(OBJS)\anitest_sample_rc.o
- $(CXX) -o $@ $(ANITEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
catalog:
if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/animate/makefile.unx b/samples/animate/makefile.unx
index 94264718bf..c6b3444199 100644
--- a/samples/animate/makefile.unx
+++ b/samples/animate/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild anitest
-install: all
+install:
uninstall:
diff --git a/samples/animate/makefile.vc b/samples/animate/makefile.vc
index 35c4fb1349..26cf162de4 100644
--- a/samples/animate/makefile.vc
+++ b/samples/animate/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -309,7 +309,7 @@ clean:
-if exist $(OBJS)\anitest.pdb del $(OBJS)\anitest.pdb
$(OBJS)\anitest.exe: $(ANITEST_OBJECTS) $(OBJS)\anitest_sample.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\anitest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\anitest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/animate/makefile.wat b/samples/animate/makefile.wat
index 9c0176489f..974c1e608e 100644
--- a/samples/animate/makefile.wat
+++ b/samples/animate/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -256,7 +256,7 @@ $(OBJS)\anitest.exe : $(ANITEST_OBJECTS) $(OBJS)\anitest_sample.res
@%append $(OBJS)\anitest.lbc option quiet
@%append $(OBJS)\anitest.lbc name $^@
@%append $(OBJS)\anitest.lbc option caseexact
- @%append $(OBJS)\anitest.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\anitest.lbc library %i
@%append $(OBJS)\anitest.lbc option resource=$(OBJS)\anitest_sample.res
diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in
index b21642a0e4..f4ad417a06 100644
--- a/samples/artprov/Makefile.in
+++ b/samples/artprov/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -60,7 +60,7 @@ ARTTEST_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -111,28 +111,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: arttest$(EXEEXT) $(__arttest_bundle___depname)
-install: all
+install:
uninstall:
@@ -148,7 +148,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
arttest$(EXEEXT): $(ARTTEST_OBJECTS) $(__arttest___win32rc)
- $(CXX) -o $@ $(ARTTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(ARTTEST_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)
$(__arttest___mac_setfilecmd)
$(__arttest___os2_emxbindcmd)
@@ -196,6 +196,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean arttest_bundle
diff --git a/samples/artprov/artprov_vc7.vcproj b/samples/artprov/artprov_vc7.vcproj
index bdcf51d94c..b313cce711 100644
--- a/samples/artprov/artprov_vc7.vcproj
+++ b/samples/artprov/artprov_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\arttest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\arttest\"
ObjectFile="vc_mswunivudll\arttest\"
ProgramDataBaseFileName="vc_mswunivudll\arttest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\arttest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\arttest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\artprov_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\arttest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\arttest\"
ObjectFile="vc_mswunivuddll\arttest\"
ProgramDataBaseFileName="vc_mswunivuddll\arttest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\arttest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\arttest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\artprov_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\arttest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\arttest\"
ObjectFile="vc_mswudll\arttest\"
ProgramDataBaseFileName="vc_mswudll\arttest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\arttest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\arttest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\artprov_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\arttest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\arttest\"
ObjectFile="vc_mswuddll\arttest\"
ProgramDataBaseFileName="vc_mswuddll\arttest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\arttest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\arttest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\artprov_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\arttest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\arttest\"
ObjectFile="vc_mswunivu\arttest\"
ProgramDataBaseFileName="vc_mswunivu\arttest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\arttest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\arttest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\artprov_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\arttest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\arttest\"
ObjectFile="vc_mswunivud\arttest\"
ProgramDataBaseFileName="vc_mswunivud\arttest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\arttest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\arttest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\artprov_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\arttest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\arttest\"
ObjectFile="vc_mswu\arttest\"
ProgramDataBaseFileName="vc_mswu\arttest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\arttest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\arttest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\artprov_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\arttest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\arttest\"
ObjectFile="vc_mswud\arttest\"
ProgramDataBaseFileName="vc_mswud\arttest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\arttest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\arttest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\artprov_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,19 +523,22 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\artbrows.cpp"/>
+ RelativePath=".\artbrows.cpp">
+ </File>
<File
- RelativePath=".\arttest.cpp"/>
+ RelativePath=".\arttest.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\arttest.rc"/>
+ RelativePath=".\arttest.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/artprov/artprov_vc8.vcproj b/samples/artprov/artprov_vc8.vcproj
index a47145c066..7c673d62ea 100644
--- a/samples/artprov/artprov_vc8.vcproj
+++ b/samples/artprov/artprov_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\arttest\"
ObjectFile="vc_mswunivudll\arttest\"
ProgramDataBaseFileName="vc_mswunivudll\arttest.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\arttest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\arttest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\arttest\"
ObjectFile="vc_mswunivuddll\arttest\"
ProgramDataBaseFileName="vc_mswunivuddll\arttest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\arttest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\arttest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\arttest\"
ObjectFile="vc_mswudll\arttest\"
ProgramDataBaseFileName="vc_mswudll\arttest.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\arttest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\arttest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\arttest\"
ObjectFile="vc_mswuddll\arttest\"
ProgramDataBaseFileName="vc_mswuddll\arttest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\arttest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\arttest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\arttest\"
ObjectFile="vc_mswunivu\arttest\"
ProgramDataBaseFileName="vc_mswunivu\arttest.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\arttest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\arttest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\arttest\"
ObjectFile="vc_mswunivud\arttest\"
ProgramDataBaseFileName="vc_mswunivud\arttest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\arttest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\arttest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\arttest\"
ObjectFile="vc_mswu\arttest\"
ProgramDataBaseFileName="vc_mswu\arttest.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\arttest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\arttest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\arttest\"
ObjectFile="vc_mswud\arttest\"
ProgramDataBaseFileName="vc_mswud\arttest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\arttest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\arttest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,24 +784,27 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\artbrows.cpp"
- />
+ >
+ </File>
<File
RelativePath=".\arttest.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\arttest.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/artprov/makefile.bcc b/samples/artprov/makefile.bcc
index b2d84e5a5c..23585022e5 100644
--- a/samples/artprov/makefile.bcc
+++ b/samples/artprov/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -230,7 +230,7 @@ clean:
-if exist $(OBJS)\arttest.ils del $(OBJS)\arttest.ils
$(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/artprov/makefile.gcc b/samples/artprov/makefile.gcc
index 0c15a18571..e5febd62dd 100644
--- a/samples/artprov/makefile.gcc
+++ b/samples/artprov/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -225,7 +225,7 @@ clean:
-if exist $(OBJS)\arttest.exe del $(OBJS)\arttest.exe
$(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest_rc.o
- $(CXX) -o $@ $(ARTTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(OBJS)\arttest_arttest.o: ./arttest.cpp
$(CXX) -c -o $@ $(ARTTEST_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/artprov/makefile.unx b/samples/artprov/makefile.unx
index f0df5d2aca..ce05c72dda 100644
--- a/samples/artprov/makefile.unx
+++ b/samples/artprov/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -86,7 +86,7 @@ endif
all: test_for_selected_wxbuild arttest
-install: all
+install:
uninstall:
diff --git a/samples/artprov/makefile.vc b/samples/artprov/makefile.vc
index 5d82ee52ac..5fdd4885ca 100644
--- a/samples/artprov/makefile.vc
+++ b/samples/artprov/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -53,18 +53,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -74,18 +74,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -306,7 +306,7 @@ clean:
-if exist $(OBJS)\arttest.pdb del $(OBJS)\arttest.pdb
$(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\arttest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\arttest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/artprov/makefile.wat b/samples/artprov/makefile.wat
index bab680bcd7..e661510af9 100644
--- a/samples/artprov/makefile.wat
+++ b/samples/artprov/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -252,7 +252,7 @@ $(OBJS)\arttest.exe : $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest.res
@%append $(OBJS)\arttest.lbc option quiet
@%append $(OBJS)\arttest.lbc name $^@
@%append $(OBJS)\arttest.lbc option caseexact
- @%append $(OBJS)\arttest.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\arttest.lbc library %i
@%append $(OBJS)\arttest.lbc option resource=$(OBJS)\arttest_arttest.res
diff --git a/samples/aui/Makefile.in b/samples/aui/Makefile.in
index 40996e1871..fb03a1ec67 100644
--- a/samples/aui/Makefile.in
+++ b/samples/aui/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -63,7 +63,7 @@ AUIDEMO_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -126,28 +126,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: auidemo$(EXEEXT) $(__auidemo_bundle___depname)
-install: all
+install:
uninstall:
@@ -163,7 +163,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
auidemo$(EXEEXT): $(AUIDEMO_OBJECTS) $(__auidemo___win32rc)
- $(CXX) -o $@ $(AUIDEMO_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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)
+ $(CXX) -o $@ $(AUIDEMO_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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)
$(__auidemo___mac_setfilecmd)
$(__auidemo___os2_emxbindcmd)
@@ -208,6 +208,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean auidemo_bundle
diff --git a/samples/aui/auidemo_vc7.vcproj b/samples/aui/auidemo_vc7.vcproj
index 28f60f253d..1dc92b9962 100644
--- a/samples/aui/auidemo_vc7.vcproj
+++ b/samples/aui/auidemo_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\auidemo"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\auidemo\"
ObjectFile="vc_mswunivudll\auidemo\"
ProgramDataBaseFileName="vc_mswunivudll\auidemo.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\auidemo.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\auidemo.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\auidemo_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\auidemo"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\auidemo\"
ObjectFile="vc_mswunivuddll\auidemo\"
ProgramDataBaseFileName="vc_mswunivuddll\auidemo.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_aui.lib wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud_xml.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_aui.lib wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud_xml.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"
OutputFile="vc_mswunivuddll\auidemo.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\auidemo.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\auidemo_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\auidemo"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\auidemo\"
ObjectFile="vc_mswudll\auidemo\"
ProgramDataBaseFileName="vc_mswudll\auidemo.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\auidemo.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\auidemo.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\auidemo_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\auidemo"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\auidemo\"
ObjectFile="vc_mswuddll\auidemo\"
ProgramDataBaseFileName="vc_mswuddll\auidemo.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_aui.lib wxmsw29ud_html.lib wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud_xml.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_aui.lib wxmsw29ud_html.lib wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud_xml.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"
OutputFile="vc_mswuddll\auidemo.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\auidemo.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\auidemo_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\auidemo"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\auidemo\"
ObjectFile="vc_mswunivu\auidemo\"
ProgramDataBaseFileName="vc_mswunivu\auidemo.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\auidemo.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\auidemo.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\auidemo_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\auidemo"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\auidemo\"
ObjectFile="vc_mswunivud\auidemo\"
ProgramDataBaseFileName="vc_mswunivud\auidemo.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_aui.lib wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud_xml.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_aui.lib wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud_xml.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"
OutputFile="vc_mswunivud\auidemo.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\auidemo.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\auidemo_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\auidemo"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\auidemo\"
ObjectFile="vc_mswu\auidemo\"
ProgramDataBaseFileName="vc_mswu\auidemo.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\auidemo.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\auidemo.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\auidemo_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\auidemo"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\auidemo\"
ObjectFile="vc_mswud\auidemo\"
ProgramDataBaseFileName="vc_mswud\auidemo.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_aui.lib wxmsw29ud_html.lib wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud_xml.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_aui.lib wxmsw29ud_html.lib wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud_xml.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"
OutputFile="vc_mswud\auidemo.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\auidemo.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\auidemo_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\auidemo.cpp"/>
+ RelativePath=".\auidemo.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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"/>
+ RelativePath=".\..\..\samples\sample.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/aui/auidemo_vc8.vcproj b/samples/aui/auidemo_vc8.vcproj
index 0b13d5efd8..79d21f0885 100644
--- a/samples/aui/auidemo_vc8.vcproj
+++ b/samples/aui/auidemo_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\auidemo\"
ObjectFile="vc_mswunivudll\auidemo\"
ProgramDataBaseFileName="vc_mswunivudll\auidemo.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\auidemo.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\auidemo.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\auidemo\"
ObjectFile="vc_mswunivuddll\auidemo\"
ProgramDataBaseFileName="vc_mswunivuddll\auidemo.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_aui.lib wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud_xml.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_aui.lib wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud_xml.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"
OutputFile="vc_mswunivuddll\auidemo.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\auidemo.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\auidemo\"
ObjectFile="vc_mswudll\auidemo\"
ProgramDataBaseFileName="vc_mswudll\auidemo.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\auidemo.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\auidemo.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\auidemo\"
ObjectFile="vc_mswuddll\auidemo\"
ProgramDataBaseFileName="vc_mswuddll\auidemo.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_aui.lib wxmsw29ud_html.lib wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud_xml.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_aui.lib wxmsw29ud_html.lib wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud_xml.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"
OutputFile="vc_mswuddll\auidemo.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\auidemo.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\auidemo\"
ObjectFile="vc_mswunivu\auidemo\"
ProgramDataBaseFileName="vc_mswunivu\auidemo.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\auidemo.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\auidemo.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\auidemo\"
ObjectFile="vc_mswunivud\auidemo\"
ProgramDataBaseFileName="vc_mswunivud\auidemo.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_aui.lib wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud_xml.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_aui.lib wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud_xml.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"
OutputFile="vc_mswunivud\auidemo.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\auidemo.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\auidemo\"
ObjectFile="vc_mswu\auidemo\"
ProgramDataBaseFileName="vc_mswu\auidemo.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\auidemo.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\auidemo.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\auidemo\"
ObjectFile="vc_mswud\auidemo\"
ProgramDataBaseFileName="vc_mswud\auidemo.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_aui.lib wxmsw29ud_html.lib wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud_xml.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_aui.lib wxmsw29ud_html.lib wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud_xml.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"
OutputFile="vc_mswud\auidemo.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\auidemo.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\auidemo.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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>
diff --git a/samples/aui/makefile.bcc b/samples/aui/makefile.bcc
index fc705b3a2b..82a87afd1c 100644
--- a/samples/aui/makefile.bcc
+++ b/samples/aui/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -245,7 +245,7 @@ clean:
-if exist $(OBJS)\auidemo.ils del $(OBJS)\auidemo.ils
$(OBJS)\auidemo.exe: $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/aui/makefile.gcc b/samples/aui/makefile.gcc
index 70227fd1e1..6a7d93fd09 100644
--- a/samples/aui/makefile.gcc
+++ b/samples/aui/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -240,7 +240,7 @@ clean:
-if exist $(OBJS)\auidemo.exe del $(OBJS)\auidemo.exe
$(OBJS)\auidemo.exe: $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample_rc.o
- $(CXX) -o $@ $(AUIDEMO_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(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
diff --git a/samples/aui/makefile.unx b/samples/aui/makefile.unx
index 8ffcd26433..778fa8fdc8 100644
--- a/samples/aui/makefile.unx
+++ b/samples/aui/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild auidemo
-install: all
+install:
uninstall:
diff --git a/samples/aui/makefile.vc b/samples/aui/makefile.vc
index 72371e0c05..0356c39917 100644
--- a/samples/aui/makefile.vc
+++ b/samples/aui/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -321,7 +321,7 @@ clean:
-if exist $(OBJS)\auidemo.pdb del $(OBJS)\auidemo.pdb
$(OBJS)\auidemo.exe: $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\auidemo.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\auidemo.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/aui/makefile.wat b/samples/aui/makefile.wat
index 3d0a7c36bd..a6215dbd7e 100644
--- a/samples/aui/makefile.wat
+++ b/samples/aui/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -271,7 +271,7 @@ $(OBJS)\auidemo.exe : $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample.res
@%append $(OBJS)\auidemo.lbc option quiet
@%append $(OBJS)\auidemo.lbc name $^@
@%append $(OBJS)\auidemo.lbc option caseexact
- @%append $(OBJS)\auidemo.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\auidemo.lbc library %i
@%append $(OBJS)\auidemo.lbc option resource=$(OBJS)\auidemo_sample.res
diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in
index 4493b70d0d..be251777b7 100644
--- a/samples/calendar/Makefile.in
+++ b/samples/calendar/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -61,7 +61,7 @@ CALENDAR_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -115,28 +115,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: calendar$(EXEEXT) $(__calendar_bundle___depname)
-install: all
+install:
uninstall:
@@ -152,7 +152,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
calendar$(EXEEXT): $(CALENDAR_OBJECTS) $(__calendar___win32rc)
- $(CXX) -o $@ $(CALENDAR_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
+ $(CXX) -o $@ $(CALENDAR_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
$(__calendar___mac_setfilecmd)
$(__calendar___os2_emxbindcmd)
@@ -197,6 +197,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean calendar_bundle
diff --git a/samples/calendar/calendar_vc7.vcproj b/samples/calendar/calendar_vc7.vcproj
index 6422f2e291..f5b72a0311 100644
--- a/samples/calendar/calendar_vc7.vcproj
+++ b/samples/calendar/calendar_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\calendar"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\calendar\"
ObjectFile="vc_mswunivudll\calendar\"
ProgramDataBaseFileName="vc_mswunivudll\calendar.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\calendar.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\calendar.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\calendar_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\calendar"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\calendar\"
ObjectFile="vc_mswunivuddll\calendar\"
ProgramDataBaseFileName="vc_mswunivuddll\calendar.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivuddll\calendar.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\calendar.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\calendar_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\calendar"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\calendar\"
ObjectFile="vc_mswudll\calendar\"
ProgramDataBaseFileName="vc_mswudll\calendar.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\calendar.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\calendar.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\calendar_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\calendar"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\calendar\"
ObjectFile="vc_mswuddll\calendar\"
ProgramDataBaseFileName="vc_mswuddll\calendar.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswuddll\calendar.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\calendar.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\calendar_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\calendar"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\calendar\"
ObjectFile="vc_mswunivu\calendar\"
ProgramDataBaseFileName="vc_mswunivu\calendar.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\calendar.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\calendar.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\calendar_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\calendar"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\calendar\"
ObjectFile="vc_mswunivud\calendar\"
ProgramDataBaseFileName="vc_mswunivud\calendar.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivud\calendar.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\calendar.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\calendar_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\calendar"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\calendar\"
ObjectFile="vc_mswu\calendar\"
ProgramDataBaseFileName="vc_mswu\calendar.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\calendar.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\calendar.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\calendar_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\calendar"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\calendar\"
ObjectFile="vc_mswud\calendar\"
ProgramDataBaseFileName="vc_mswud\calendar.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswud\calendar.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\calendar.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\calendar_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\calendar.cpp"/>
+ RelativePath=".\calendar.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\calendar.rc"/>
+ RelativePath=".\calendar.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/calendar/calendar_vc8.vcproj b/samples/calendar/calendar_vc8.vcproj
index cb934491af..16d2c997d8 100644
--- a/samples/calendar/calendar_vc8.vcproj
+++ b/samples/calendar/calendar_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\calendar\"
ObjectFile="vc_mswunivudll\calendar\"
ProgramDataBaseFileName="vc_mswunivudll\calendar.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\calendar.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\calendar.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\calendar\"
ObjectFile="vc_mswunivuddll\calendar\"
ProgramDataBaseFileName="vc_mswunivuddll\calendar.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivuddll\calendar.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\calendar.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\calendar\"
ObjectFile="vc_mswudll\calendar\"
ProgramDataBaseFileName="vc_mswudll\calendar.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\calendar.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\calendar.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\calendar\"
ObjectFile="vc_mswuddll\calendar\"
ProgramDataBaseFileName="vc_mswuddll\calendar.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswuddll\calendar.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\calendar.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\calendar\"
ObjectFile="vc_mswunivu\calendar\"
ProgramDataBaseFileName="vc_mswunivu\calendar.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\calendar.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\calendar.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\calendar\"
ObjectFile="vc_mswunivud\calendar\"
ProgramDataBaseFileName="vc_mswunivud\calendar.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivud\calendar.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\calendar.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\calendar\"
ObjectFile="vc_mswu\calendar\"
ProgramDataBaseFileName="vc_mswu\calendar.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\calendar.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\calendar.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\calendar\"
ObjectFile="vc_mswud\calendar\"
ProgramDataBaseFileName="vc_mswud\calendar.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswud\calendar.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\calendar.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\calendar.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\calendar.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/calendar/makefile.bcc b/samples/calendar/makefile.bcc
index c0db2c2653..76e2ce7ef1 100644
--- a/samples/calendar/makefile.bcc
+++ b/samples/calendar/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -233,7 +233,7 @@ clean:
-if exist $(OBJS)\calendar.ils del $(OBJS)\calendar.ils
$(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/calendar/makefile.gcc b/samples/calendar/makefile.gcc
index 8139f5daff..f32ec6ff05 100644
--- a/samples/calendar/makefile.gcc
+++ b/samples/calendar/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -228,7 +228,7 @@ clean:
-if exist $(OBJS)\calendar.exe del $(OBJS)\calendar.exe
$(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar_rc.o
- $(CXX) -o $@ $(CALENDAR_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(OBJS)\calendar_calendar.o: ./calendar.cpp
$(CXX) -c -o $@ $(CALENDAR_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/calendar/makefile.unx b/samples/calendar/makefile.unx
index 87a3015b2c..3815b0c000 100644
--- a/samples/calendar/makefile.unx
+++ b/samples/calendar/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild calendar
-install: all
+install:
uninstall:
diff --git a/samples/calendar/makefile.vc b/samples/calendar/makefile.vc
index 1524e991c4..280cf6b9da 100644
--- a/samples/calendar/makefile.vc
+++ b/samples/calendar/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -309,7 +309,7 @@ clean:
-if exist $(OBJS)\calendar.pdb del $(OBJS)\calendar.pdb
$(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\calendar.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\calendar.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/calendar/makefile.wat b/samples/calendar/makefile.wat
index 3c25cb8920..484b6bbe55 100644
--- a/samples/calendar/makefile.wat
+++ b/samples/calendar/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -256,7 +256,7 @@ $(OBJS)\calendar.exe : $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar.res
@%append $(OBJS)\calendar.lbc option quiet
@%append $(OBJS)\calendar.lbc name $^@
@%append $(OBJS)\calendar.lbc option caseexact
- @%append $(OBJS)\calendar.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\calendar.lbc library %i
@%append $(OBJS)\calendar.lbc option resource=$(OBJS)\calendar_calendar.res
diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in
index fe82099def..58ad622fd4 100644
--- a/samples/caret/Makefile.in
+++ b/samples/caret/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ CARET_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: caret$(EXEEXT) $(__caret_bundle___depname)
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
caret$(EXEEXT): $(CARET_OBJECTS) $(__caret___win32rc)
- $(CXX) -o $@ $(CARET_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(CARET_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)
$(__caret___mac_setfilecmd)
$(__caret___os2_emxbindcmd)
@@ -192,6 +192,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean caret_bundle
diff --git a/samples/caret/caret_vc7.vcproj b/samples/caret/caret_vc7.vcproj
index 503ddcb52a..903b83ee5a 100644
--- a/samples/caret/caret_vc7.vcproj
+++ b/samples/caret/caret_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\caret"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\caret\"
ObjectFile="vc_mswunivudll\caret\"
ProgramDataBaseFileName="vc_mswunivudll\caret.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\caret.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\caret.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\caret_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\caret"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\caret\"
ObjectFile="vc_mswunivuddll\caret\"
ProgramDataBaseFileName="vc_mswunivuddll\caret.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\caret.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\caret.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\caret_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\caret"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\caret\"
ObjectFile="vc_mswudll\caret\"
ProgramDataBaseFileName="vc_mswudll\caret.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\caret.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\caret.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\caret_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\caret"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\caret\"
ObjectFile="vc_mswuddll\caret\"
ProgramDataBaseFileName="vc_mswuddll\caret.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\caret.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\caret.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\caret_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\caret"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\caret\"
ObjectFile="vc_mswunivu\caret\"
ProgramDataBaseFileName="vc_mswunivu\caret.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\caret.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\caret.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\caret_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\caret"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\caret\"
ObjectFile="vc_mswunivud\caret\"
ProgramDataBaseFileName="vc_mswunivud\caret.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\caret.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\caret.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\caret_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\caret"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\caret\"
ObjectFile="vc_mswu\caret\"
ProgramDataBaseFileName="vc_mswu\caret.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\caret.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\caret.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\caret_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\caret"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\caret\"
ObjectFile="vc_mswud\caret\"
ProgramDataBaseFileName="vc_mswud\caret.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\caret.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\caret.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\caret_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\caret.cpp"/>
+ RelativePath=".\caret.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\caret.rc"/>
+ RelativePath=".\caret.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/caret/caret_vc8.vcproj b/samples/caret/caret_vc8.vcproj
index fc7bbd6d6e..778be001ee 100644
--- a/samples/caret/caret_vc8.vcproj
+++ b/samples/caret/caret_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\caret\"
ObjectFile="vc_mswunivudll\caret\"
ProgramDataBaseFileName="vc_mswunivudll\caret.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\caret.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\caret.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\caret\"
ObjectFile="vc_mswunivuddll\caret\"
ProgramDataBaseFileName="vc_mswunivuddll\caret.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\caret.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\caret.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\caret\"
ObjectFile="vc_mswudll\caret\"
ProgramDataBaseFileName="vc_mswudll\caret.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\caret.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\caret.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\caret\"
ObjectFile="vc_mswuddll\caret\"
ProgramDataBaseFileName="vc_mswuddll\caret.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\caret.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\caret.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\caret\"
ObjectFile="vc_mswunivu\caret\"
ProgramDataBaseFileName="vc_mswunivu\caret.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\caret.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\caret.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\caret\"
ObjectFile="vc_mswunivud\caret\"
ProgramDataBaseFileName="vc_mswunivud\caret.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\caret.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\caret.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\caret\"
ObjectFile="vc_mswu\caret\"
ProgramDataBaseFileName="vc_mswu\caret.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\caret.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\caret.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\caret\"
ObjectFile="vc_mswud\caret\"
ProgramDataBaseFileName="vc_mswud\caret.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\caret.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\caret.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\caret.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\caret.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/caret/makefile.bcc b/samples/caret/makefile.bcc
index 1f3ebe7eb7..1aa4f90b2c 100644
--- a/samples/caret/makefile.bcc
+++ b/samples/caret/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\caret.ils del $(OBJS)\caret.ils
$(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_caret.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/caret/makefile.gcc b/samples/caret/makefile.gcc
index e7970a9a29..98e76996f7 100644
--- a/samples/caret/makefile.gcc
+++ b/samples/caret/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\caret.exe del $(OBJS)\caret.exe
$(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_caret_rc.o
- $(CXX) -o $@ $(CARET_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(OBJS)\caret_caret.o: ./caret.cpp
$(CXX) -c -o $@ $(CARET_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/caret/makefile.unx b/samples/caret/makefile.unx
index 2392220f01..6eb2187196 100644
--- a/samples/caret/makefile.unx
+++ b/samples/caret/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild caret
-install: all
+install:
uninstall:
diff --git a/samples/caret/makefile.vc b/samples/caret/makefile.vc
index dc4f993a2a..c3dc4ad1bb 100644
--- a/samples/caret/makefile.vc
+++ b/samples/caret/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\caret.pdb del $(OBJS)\caret.pdb
$(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_caret.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\caret.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\caret.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/caret/makefile.wat b/samples/caret/makefile.wat
index 441fa4bec5..bce05f1a2c 100644
--- a/samples/caret/makefile.wat
+++ b/samples/caret/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\caret.exe : $(CARET_OBJECTS) $(OBJS)\caret_caret.res
@%append $(OBJS)\caret.lbc option quiet
@%append $(OBJS)\caret.lbc name $^@
@%append $(OBJS)\caret.lbc option caseexact
- @%append $(OBJS)\caret.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\caret.lbc library %i
@%append $(OBJS)\caret.lbc option resource=$(OBJS)\caret_caret.res
diff --git a/samples/collpane/Makefile.in b/samples/collpane/Makefile.in
index 244c8775d3..3c318184b4 100644
--- a/samples/collpane/Makefile.in
+++ b/samples/collpane/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -61,7 +61,7 @@ COLLPANE_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -115,28 +115,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: collpane$(EXEEXT) $(__collpane_bundle___depname)
-install: all
+install:
uninstall:
@@ -152,7 +152,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
collpane$(EXEEXT): $(COLLPANE_OBJECTS) $(__collpane___win32rc)
- $(CXX) -o $@ $(COLLPANE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
+ $(CXX) -o $@ $(COLLPANE_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
$(__collpane___mac_setfilecmd)
$(__collpane___os2_emxbindcmd)
@@ -197,6 +197,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean collpane_bundle
diff --git a/samples/collpane/collpane_vc7.vcproj b/samples/collpane/collpane_vc7.vcproj
index 02a6175b2f..15ab5f5de4 100644
--- a/samples/collpane/collpane_vc7.vcproj
+++ b/samples/collpane/collpane_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\collpane"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\collpane\"
ObjectFile="vc_mswunivudll\collpane\"
ProgramDataBaseFileName="vc_mswunivudll\collpane.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\collpane.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\collpane.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\collpane_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\collpane"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\collpane\"
ObjectFile="vc_mswunivuddll\collpane\"
ProgramDataBaseFileName="vc_mswunivuddll\collpane.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivuddll\collpane.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\collpane.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\collpane_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\collpane"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\collpane\"
ObjectFile="vc_mswudll\collpane\"
ProgramDataBaseFileName="vc_mswudll\collpane.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\collpane.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\collpane.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\collpane_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\collpane"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\collpane\"
ObjectFile="vc_mswuddll\collpane\"
ProgramDataBaseFileName="vc_mswuddll\collpane.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswuddll\collpane.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\collpane.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\collpane_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\collpane"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\collpane\"
ObjectFile="vc_mswunivu\collpane\"
ProgramDataBaseFileName="vc_mswunivu\collpane.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\collpane.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\collpane.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\collpane_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\collpane"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\collpane\"
ObjectFile="vc_mswunivud\collpane\"
ProgramDataBaseFileName="vc_mswunivud\collpane.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivud\collpane.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\collpane.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\collpane_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\collpane"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\collpane\"
ObjectFile="vc_mswu\collpane\"
ProgramDataBaseFileName="vc_mswu\collpane.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\collpane.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\collpane.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\collpane_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\collpane"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\collpane\"
ObjectFile="vc_mswud\collpane\"
ProgramDataBaseFileName="vc_mswud\collpane.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswud\collpane.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\collpane.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\collpane_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\collpane.cpp"/>
+ RelativePath=".\collpane.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\..\sample.rc"/>
+ RelativePath=".\..\sample.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/collpane/collpane_vc8.vcproj b/samples/collpane/collpane_vc8.vcproj
index 59de5c2d5a..a2f4d368fd 100644
--- a/samples/collpane/collpane_vc8.vcproj
+++ b/samples/collpane/collpane_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\collpane\"
ObjectFile="vc_mswunivudll\collpane\"
ProgramDataBaseFileName="vc_mswunivudll\collpane.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\collpane.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\collpane.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\collpane\"
ObjectFile="vc_mswunivuddll\collpane\"
ProgramDataBaseFileName="vc_mswunivuddll\collpane.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivuddll\collpane.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\collpane.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\collpane\"
ObjectFile="vc_mswudll\collpane\"
ProgramDataBaseFileName="vc_mswudll\collpane.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\collpane.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\collpane.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\collpane\"
ObjectFile="vc_mswuddll\collpane\"
ProgramDataBaseFileName="vc_mswuddll\collpane.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswuddll\collpane.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\collpane.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\collpane\"
ObjectFile="vc_mswunivu\collpane\"
ProgramDataBaseFileName="vc_mswunivu\collpane.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\collpane.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\collpane.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\collpane\"
ObjectFile="vc_mswunivud\collpane\"
ProgramDataBaseFileName="vc_mswunivud\collpane.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivud\collpane.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\collpane.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\collpane\"
ObjectFile="vc_mswu\collpane\"
ProgramDataBaseFileName="vc_mswu\collpane.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\collpane.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\collpane.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\collpane\"
ObjectFile="vc_mswud\collpane\"
ProgramDataBaseFileName="vc_mswud\collpane.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswud\collpane.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\collpane.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\collpane.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\..\sample.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/collpane/makefile.bcc b/samples/collpane/makefile.bcc
index 159bd58368..bc270bf962 100644
--- a/samples/collpane/makefile.bcc
+++ b/samples/collpane/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -233,7 +233,7 @@ clean:
-if exist $(OBJS)\collpane.ils del $(OBJS)\collpane.ils
$(OBJS)\collpane.exe: $(COLLPANE_OBJECTS) $(OBJS)\collpane_sample.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/collpane/makefile.gcc b/samples/collpane/makefile.gcc
index 328ef9d828..9a3637b318 100644
--- a/samples/collpane/makefile.gcc
+++ b/samples/collpane/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -228,7 +228,7 @@ clean:
-if exist $(OBJS)\collpane.exe del $(OBJS)\collpane.exe
$(OBJS)\collpane.exe: $(COLLPANE_OBJECTS) $(OBJS)\collpane_sample_rc.o
- $(CXX) -o $@ $(COLLPANE_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(OBJS)\collpane_collpane.o: ./collpane.cpp
$(CXX) -c -o $@ $(COLLPANE_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/collpane/makefile.unx b/samples/collpane/makefile.unx
index b172b8d79e..38f7117c15 100644
--- a/samples/collpane/makefile.unx
+++ b/samples/collpane/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild collpane
-install: all
+install:
uninstall:
diff --git a/samples/collpane/makefile.vc b/samples/collpane/makefile.vc
index 9ad440d5d7..258a534ca8 100644
--- a/samples/collpane/makefile.vc
+++ b/samples/collpane/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -309,7 +309,7 @@ clean:
-if exist $(OBJS)\collpane.pdb del $(OBJS)\collpane.pdb
$(OBJS)\collpane.exe: $(COLLPANE_OBJECTS) $(OBJS)\collpane_sample.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\collpane.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\collpane.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/collpane/makefile.wat b/samples/collpane/makefile.wat
index e234b2ece2..ce916e079c 100644
--- a/samples/collpane/makefile.wat
+++ b/samples/collpane/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -256,7 +256,7 @@ $(OBJS)\collpane.exe : $(COLLPANE_OBJECTS) $(OBJS)\collpane_sample.res
@%append $(OBJS)\collpane.lbc option quiet
@%append $(OBJS)\collpane.lbc name $^@
@%append $(OBJS)\collpane.lbc option caseexact
- @%append $(OBJS)\collpane.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\collpane.lbc library %i
@%append $(OBJS)\collpane.lbc option resource=$(OBJS)\collpane_sample.res
diff --git a/samples/combo/Makefile.in b/samples/combo/Makefile.in
index 4a42ff27b1..f48e4d0e2e 100644
--- a/samples/combo/Makefile.in
+++ b/samples/combo/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -61,7 +61,7 @@ COMBO_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -115,28 +115,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: combo$(EXEEXT) $(__combo_bundle___depname) data
-install: all
+install:
uninstall:
@@ -152,7 +152,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
combo$(EXEEXT): $(COMBO_OBJECTS) $(__combo___win32rc)
- $(CXX) -o $@ $(COMBO_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
+ $(CXX) -o $@ $(COMBO_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
$(__combo___mac_setfilecmd)
$(__combo___os2_emxbindcmd)
@@ -209,6 +209,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean combo_bundle data
diff --git a/samples/combo/combo_vc7.vcproj b/samples/combo/combo_vc7.vcproj
index 906b5de641..ddbfcc01b3 100644
--- a/samples/combo/combo_vc7.vcproj
+++ b/samples/combo/combo_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\combo"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\combo\"
ObjectFile="vc_mswunivudll\combo\"
ProgramDataBaseFileName="vc_mswunivudll\combo.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\combo.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\combo.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\combo_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\combo"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\combo\"
ObjectFile="vc_mswunivuddll\combo\"
ProgramDataBaseFileName="vc_mswunivuddll\combo.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivuddll\combo.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\combo.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\combo_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\combo"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\combo\"
ObjectFile="vc_mswudll\combo\"
ProgramDataBaseFileName="vc_mswudll\combo.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\combo.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\combo.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\combo_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\combo"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\combo\"
ObjectFile="vc_mswuddll\combo\"
ProgramDataBaseFileName="vc_mswuddll\combo.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswuddll\combo.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\combo.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\combo_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\combo"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\combo\"
ObjectFile="vc_mswunivu\combo\"
ProgramDataBaseFileName="vc_mswunivu\combo.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\combo.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\combo.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\combo_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\combo"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\combo\"
ObjectFile="vc_mswunivud\combo\"
ProgramDataBaseFileName="vc_mswunivud\combo.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivud\combo.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\combo.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\combo_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\combo"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\combo\"
ObjectFile="vc_mswu\combo\"
ProgramDataBaseFileName="vc_mswu\combo.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\combo.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\combo.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\combo_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\combo"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\combo\"
ObjectFile="vc_mswud\combo\"
ProgramDataBaseFileName="vc_mswud\combo.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswud\combo.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\combo.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\combo_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\combo.cpp"/>
+ RelativePath=".\combo.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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"/>
+ RelativePath=".\..\..\samples\sample.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/combo/combo_vc8.vcproj b/samples/combo/combo_vc8.vcproj
index 530e1a7753..75e7ac8a96 100644
--- a/samples/combo/combo_vc8.vcproj
+++ b/samples/combo/combo_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\combo\"
ObjectFile="vc_mswunivudll\combo\"
ProgramDataBaseFileName="vc_mswunivudll\combo.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\combo.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\combo.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\combo\"
ObjectFile="vc_mswunivuddll\combo\"
ProgramDataBaseFileName="vc_mswunivuddll\combo.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivuddll\combo.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\combo.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\combo\"
ObjectFile="vc_mswudll\combo\"
ProgramDataBaseFileName="vc_mswudll\combo.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\combo.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\combo.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\combo\"
ObjectFile="vc_mswuddll\combo\"
ProgramDataBaseFileName="vc_mswuddll\combo.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswuddll\combo.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\combo.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\combo\"
ObjectFile="vc_mswunivu\combo\"
ProgramDataBaseFileName="vc_mswunivu\combo.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\combo.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\combo.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\combo\"
ObjectFile="vc_mswunivud\combo\"
ProgramDataBaseFileName="vc_mswunivud\combo.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivud\combo.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\combo.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\combo\"
ObjectFile="vc_mswu\combo\"
ProgramDataBaseFileName="vc_mswu\combo.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\combo.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\combo.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\combo\"
ObjectFile="vc_mswud\combo\"
ProgramDataBaseFileName="vc_mswud\combo.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswud\combo.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\combo.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\combo.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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>
diff --git a/samples/combo/makefile.bcc b/samples/combo/makefile.bcc
index 989b86cf21..5ecf04b91c 100644
--- a/samples/combo/makefile.bcc
+++ b/samples/combo/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -233,7 +233,7 @@ clean:
-if exist $(OBJS)\combo.ils del $(OBJS)\combo.ils
$(OBJS)\combo.exe: $(COMBO_OBJECTS) $(OBJS)\combo_sample.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/combo/makefile.gcc b/samples/combo/makefile.gcc
index b24a5a06ce..1e22872c29 100644
--- a/samples/combo/makefile.gcc
+++ b/samples/combo/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -228,7 +228,7 @@ clean:
-if exist $(OBJS)\combo.exe del $(OBJS)\combo.exe
$(OBJS)\combo.exe: $(COMBO_OBJECTS) $(OBJS)\combo_sample_rc.o
- $(CXX) -o $@ $(COMBO_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
data:
if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/combo/makefile.unx b/samples/combo/makefile.unx
index 719627ad93..b130fbcce5 100644
--- a/samples/combo/makefile.unx
+++ b/samples/combo/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild combo
-install: all
+install:
uninstall:
diff --git a/samples/combo/makefile.vc b/samples/combo/makefile.vc
index 3b62b94875..3aefd7ea87 100644
--- a/samples/combo/makefile.vc
+++ b/samples/combo/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -309,7 +309,7 @@ clean:
-if exist $(OBJS)\combo.pdb del $(OBJS)\combo.pdb
$(OBJS)\combo.exe: $(COMBO_OBJECTS) $(OBJS)\combo_sample.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\combo.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\combo.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/combo/makefile.wat b/samples/combo/makefile.wat
index 84c8a868fa..cb6d596ff1 100644
--- a/samples/combo/makefile.wat
+++ b/samples/combo/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -256,7 +256,7 @@ $(OBJS)\combo.exe : $(COMBO_OBJECTS) $(OBJS)\combo_sample.res
@%append $(OBJS)\combo.lbc option quiet
@%append $(OBJS)\combo.lbc name $^@
@%append $(OBJS)\combo.lbc option caseexact
- @%append $(OBJS)\combo.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\combo.lbc library %i
@%append $(OBJS)\combo.lbc option resource=$(OBJS)\combo_sample.res
diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in
index 2639010716..bf8360f520 100644
--- a/samples/config/Makefile.in
+++ b/samples/config/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ CONFTEST_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: conftest$(EXEEXT) $(__conftest_bundle___depname)
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
conftest$(EXEEXT): $(CONFTEST_OBJECTS) $(__conftest___win32rc)
- $(CXX) -o $@ $(CONFTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(CONFTEST_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)
$(__conftest___mac_setfilecmd)
$(__conftest___os2_emxbindcmd)
@@ -192,6 +192,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean conftest_bundle
diff --git a/samples/config/config_vc7.vcproj b/samples/config/config_vc7.vcproj
index cb36be4aa8..36f2693675 100644
--- a/samples/config/config_vc7.vcproj
+++ b/samples/config/config_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\conftest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\conftest\"
ObjectFile="vc_mswunivudll\conftest\"
ProgramDataBaseFileName="vc_mswunivudll\conftest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\conftest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\conftest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\config_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\conftest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\conftest\"
ObjectFile="vc_mswunivuddll\conftest\"
ProgramDataBaseFileName="vc_mswunivuddll\conftest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\conftest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\conftest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\config_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\conftest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\conftest\"
ObjectFile="vc_mswudll\conftest\"
ProgramDataBaseFileName="vc_mswudll\conftest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\conftest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\conftest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\config_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\conftest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\conftest\"
ObjectFile="vc_mswuddll\conftest\"
ProgramDataBaseFileName="vc_mswuddll\conftest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\conftest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\conftest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\config_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\conftest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\conftest\"
ObjectFile="vc_mswunivu\conftest\"
ProgramDataBaseFileName="vc_mswunivu\conftest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\conftest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\conftest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\config_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\conftest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\conftest\"
ObjectFile="vc_mswunivud\conftest\"
ProgramDataBaseFileName="vc_mswunivud\conftest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\conftest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\conftest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\config_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\conftest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\conftest\"
ObjectFile="vc_mswu\conftest\"
ProgramDataBaseFileName="vc_mswu\conftest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\conftest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\conftest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\config_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\conftest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\conftest\"
ObjectFile="vc_mswud\conftest\"
ProgramDataBaseFileName="vc_mswud\conftest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\conftest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\conftest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\config_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\conftest.cpp"/>
+ RelativePath=".\conftest.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\conftest.rc"/>
+ RelativePath=".\conftest.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/config/config_vc8.vcproj b/samples/config/config_vc8.vcproj
index d8d13de82b..68eef08a28 100644
--- a/samples/config/config_vc8.vcproj
+++ b/samples/config/config_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\conftest\"
ObjectFile="vc_mswunivudll\conftest\"
ProgramDataBaseFileName="vc_mswunivudll\conftest.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\conftest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\conftest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\conftest\"
ObjectFile="vc_mswunivuddll\conftest\"
ProgramDataBaseFileName="vc_mswunivuddll\conftest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\conftest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\conftest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\conftest\"
ObjectFile="vc_mswudll\conftest\"
ProgramDataBaseFileName="vc_mswudll\conftest.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\conftest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\conftest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\conftest\"
ObjectFile="vc_mswuddll\conftest\"
ProgramDataBaseFileName="vc_mswuddll\conftest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\conftest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\conftest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\conftest\"
ObjectFile="vc_mswunivu\conftest\"
ProgramDataBaseFileName="vc_mswunivu\conftest.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\conftest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\conftest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\conftest\"
ObjectFile="vc_mswunivud\conftest\"
ProgramDataBaseFileName="vc_mswunivud\conftest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\conftest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\conftest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\conftest\"
ObjectFile="vc_mswu\conftest\"
ProgramDataBaseFileName="vc_mswu\conftest.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\conftest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\conftest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\conftest\"
ObjectFile="vc_mswud\conftest\"
ProgramDataBaseFileName="vc_mswud\conftest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\conftest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\conftest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\conftest.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\conftest.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/config/makefile.bcc b/samples/config/makefile.bcc
index 203d1cbb4b..1f82440ae7 100644
--- a/samples/config/makefile.bcc
+++ b/samples/config/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\conftest.ils del $(OBJS)\conftest.ils
$(OBJS)\conftest.exe: $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/config/makefile.gcc b/samples/config/makefile.gcc
index 8b250ca39e..79620feb0c 100644
--- a/samples/config/makefile.gcc
+++ b/samples/config/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\conftest.exe del $(OBJS)\conftest.exe
$(OBJS)\conftest.exe: $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest_rc.o
- $(CXX) -o $@ $(CONFTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(OBJS)\conftest_conftest.o: ./conftest.cpp
$(CXX) -c -o $@ $(CONFTEST_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/config/makefile.unx b/samples/config/makefile.unx
index ada4fe8348..9d6072df03 100644
--- a/samples/config/makefile.unx
+++ b/samples/config/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild conftest
-install: all
+install:
uninstall:
diff --git a/samples/config/makefile.vc b/samples/config/makefile.vc
index 16d790537f..7680e6b640 100644
--- a/samples/config/makefile.vc
+++ b/samples/config/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\conftest.pdb del $(OBJS)\conftest.pdb
$(OBJS)\conftest.exe: $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\conftest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\conftest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/config/makefile.wat b/samples/config/makefile.wat
index 588e1b9872..a9d8952e25 100644
--- a/samples/config/makefile.wat
+++ b/samples/config/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\conftest.exe : $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest.res
@%append $(OBJS)\conftest.lbc option quiet
@%append $(OBJS)\conftest.lbc name $^@
@%append $(OBJS)\conftest.lbc option caseexact
- @%append $(OBJS)\conftest.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\conftest.lbc library %i
@%append $(OBJS)\conftest.lbc option resource=$(OBJS)\conftest_conftest.res
diff --git a/samples/console/Makefile.in b/samples/console/Makefile.in
index a25679eee0..8e780455cc 100644
--- a/samples/console/Makefile.in
+++ b/samples/console/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,7 +52,7 @@ CONSOLE_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -75,19 +75,19 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: console$(EXEEXT) data
-install: all
+install:
uninstall:
@@ -102,7 +102,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
console$(EXEEXT): $(CONSOLE_OBJECTS)
- $(CXX) -o $@ $(CONSOLE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+ $(CXX) -o $@ $(CONSOLE_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
$(__console___mac_setfilecmd)
$(SAMPLES_RPATH_POSTLINK)
@@ -133,6 +133,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean data
diff --git a/samples/console/console_vc7.vcproj b/samples/console/console_vc7.vcproj
index 7993b96371..c4afca82e6 100644
--- a/samples/console/console_vc7.vcproj
+++ b/samples/console/console_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\console"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\console\"
ObjectFile="vc_mswunivudll\console\"
ProgramDataBaseFileName="vc_mswunivudll\console.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\console.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\console.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\console_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\console"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\console\"
ObjectFile="vc_mswunivuddll\console\"
ProgramDataBaseFileName="vc_mswunivuddll\console.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswunivuddll\console.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\console.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\console_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\console"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\console\"
ObjectFile="vc_mswudll\console\"
ProgramDataBaseFileName="vc_mswudll\console.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\console.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\console.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\console_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\console"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\console\"
ObjectFile="vc_mswuddll\console\"
ProgramDataBaseFileName="vc_mswuddll\console.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswuddll\console.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\console.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\console_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\console"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\console\"
ObjectFile="vc_mswunivu\console\"
ProgramDataBaseFileName="vc_mswunivu\console.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\console.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\console.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\console_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\console"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\console\"
ObjectFile="vc_mswunivud\console\"
ProgramDataBaseFileName="vc_mswunivud\console.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswunivud\console.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\console.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\console_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\console"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\console\"
ObjectFile="vc_mswu\console\"
ProgramDataBaseFileName="vc_mswu\console.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\console.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\console.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\console_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\console"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\console\"
ObjectFile="vc_mswud\console\"
ProgramDataBaseFileName="vc_mswud\console.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswud\console.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\console.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\console_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,10 +523,11 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\console.cpp"/>
+ RelativePath=".\console.cpp">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/console/console_vc8.vcproj b/samples/console/console_vc8.vcproj
index 31002a97d9..d25b30ad76 100644
--- a/samples/console/console_vc8.vcproj
+++ b/samples/console/console_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\console\"
ObjectFile="vc_mswunivudll\console\"
ProgramDataBaseFileName="vc_mswunivudll\console.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\console.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\console.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\console\"
ObjectFile="vc_mswunivuddll\console\"
ProgramDataBaseFileName="vc_mswunivuddll\console.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswunivuddll\console.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\console.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\console\"
ObjectFile="vc_mswudll\console\"
ProgramDataBaseFileName="vc_mswudll\console.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\console.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\console.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\console\"
ObjectFile="vc_mswuddll\console\"
ProgramDataBaseFileName="vc_mswuddll\console.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswuddll\console.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\console.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\console\"
ObjectFile="vc_mswunivu\console\"
ProgramDataBaseFileName="vc_mswunivu\console.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\console.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\console.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\console\"
ObjectFile="vc_mswunivud\console\"
ProgramDataBaseFileName="vc_mswunivud\console.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswunivud\console.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\console.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\console\"
ObjectFile="vc_mswu\console\"
ProgramDataBaseFileName="vc_mswu\console.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\console.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\console.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\console\"
ObjectFile="vc_mswud\console\"
ProgramDataBaseFileName="vc_mswud\console.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswud\console.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\console.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,12 +784,13 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\console.cpp"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/console/makefile.bcc b/samples/console/makefile.bcc
index 47ef0fc6fb..61409bee44 100644
--- a/samples/console/makefile.bcc
+++ b/samples/console/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -187,7 +187,7 @@ clean:
-if exist $(OBJS)\console.ils del $(OBJS)\console.ils
$(OBJS)\console.exe: $(CONSOLE_OBJECTS)
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap @&&|
+ 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,,
|
diff --git a/samples/console/makefile.gcc b/samples/console/makefile.gcc
index 48bd4be73e..573c93b187 100644
--- a/samples/console/makefile.gcc
+++ b/samples/console/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -179,7 +179,7 @@ clean:
-if exist $(OBJS)\console.exe del $(OBJS)\console.exe
$(OBJS)\console.exe: $(CONSOLE_OBJECTS)
- $(CXX) -o $@ $(CONSOLE_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(__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
+ $(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
data:
if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/console/makefile.unx b/samples/console/makefile.unx
index c1be843c17..5582cd9230 100644
--- a/samples/console/makefile.unx
+++ b/samples/console/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild console
-install: all
+install:
uninstall:
diff --git a/samples/console/makefile.vc b/samples/console/makefile.vc
index ffc6430bac..5c6cb4b682 100644
--- a/samples/console/makefile.vc
+++ b/samples/console/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -51,18 +51,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -72,18 +72,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -244,7 +244,7 @@ clean:
-if exist $(OBJS)\console.pdb del $(OBJS)\console.pdb
$(OBJS)\console.exe: $(CONSOLE_OBJECTS)
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\console.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE @<<
+ 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
<<
diff --git a/samples/console/makefile.wat b/samples/console/makefile.wat
index 4102490c14..e4607041ad 100644
--- a/samples/console/makefile.wat
+++ b/samples/console/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -238,7 +238,7 @@ $(OBJS)\console.exe : $(CONSOLE_OBJECTS)
@%append $(OBJS)\console.lbc option quiet
@%append $(OBJS)\console.lbc name $^@
@%append $(OBJS)\console.lbc option caseexact
- @%append $(OBJS)\console.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_'
+ @%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) do @%append $(OBJS)\console.lbc library %i
@%append $(OBJS)\console.lbc
diff --git a/samples/controls/Makefile.in b/samples/controls/Makefile.in
index 744fe4dd06..f67726faff 100644
--- a/samples/controls/Makefile.in
+++ b/samples/controls/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ CONTROLS_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: controls$(EXEEXT) $(__controls_bundle___depname) data
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
controls$(EXEEXT): $(CONTROLS_OBJECTS) $(__controls___win32rc)
- $(CXX) -o $@ $(CONTROLS_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(CONTROLS_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)
$(__controls___mac_setfilecmd)
$(__controls___os2_emxbindcmd)
@@ -204,6 +204,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean controls_bundle data
diff --git a/samples/controls/controls_vc7.vcproj b/samples/controls/controls_vc7.vcproj
index c18588a747..461ae9a194 100644
--- a/samples/controls/controls_vc7.vcproj
+++ b/samples/controls/controls_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\controls"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\controls\"
ObjectFile="vc_mswunivudll\controls\"
ProgramDataBaseFileName="vc_mswunivudll\controls.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\controls.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\controls.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\controls_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\controls"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\controls\"
ObjectFile="vc_mswunivuddll\controls\"
ProgramDataBaseFileName="vc_mswunivuddll\controls.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\controls.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\controls.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\controls_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\controls"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\controls\"
ObjectFile="vc_mswudll\controls\"
ProgramDataBaseFileName="vc_mswudll\controls.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\controls.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\controls.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\controls_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\controls"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\controls\"
ObjectFile="vc_mswuddll\controls\"
ProgramDataBaseFileName="vc_mswuddll\controls.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\controls.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\controls.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\controls_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\controls"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\controls\"
ObjectFile="vc_mswunivu\controls\"
ProgramDataBaseFileName="vc_mswunivu\controls.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\controls.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\controls.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\controls_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\controls"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\controls\"
ObjectFile="vc_mswunivud\controls\"
ProgramDataBaseFileName="vc_mswunivud\controls.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\controls.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\controls.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\controls_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\controls"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\controls\"
ObjectFile="vc_mswu\controls\"
ProgramDataBaseFileName="vc_mswu\controls.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\controls.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\controls.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\controls_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\controls"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\controls\"
ObjectFile="vc_mswud\controls\"
ProgramDataBaseFileName="vc_mswud\controls.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\controls.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\controls.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\controls_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\controls.cpp"/>
+ RelativePath=".\controls.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\controls.rc"/>
+ RelativePath=".\controls.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/controls/controls_vc8.vcproj b/samples/controls/controls_vc8.vcproj
index 78d8fd9e5a..5f20aa5cd4 100644
--- a/samples/controls/controls_vc8.vcproj
+++ b/samples/controls/controls_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\controls\"
ObjectFile="vc_mswunivudll\controls\"
ProgramDataBaseFileName="vc_mswunivudll\controls.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\controls.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\controls.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\controls\"
ObjectFile="vc_mswunivuddll\controls\"
ProgramDataBaseFileName="vc_mswunivuddll\controls.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\controls.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\controls.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\controls\"
ObjectFile="vc_mswudll\controls\"
ProgramDataBaseFileName="vc_mswudll\controls.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\controls.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\controls.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\controls\"
ObjectFile="vc_mswuddll\controls\"
ProgramDataBaseFileName="vc_mswuddll\controls.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\controls.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\controls.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\controls\"
ObjectFile="vc_mswunivu\controls\"
ProgramDataBaseFileName="vc_mswunivu\controls.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\controls.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\controls.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\controls\"
ObjectFile="vc_mswunivud\controls\"
ProgramDataBaseFileName="vc_mswunivud\controls.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\controls.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\controls.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\controls\"
ObjectFile="vc_mswu\controls\"
ProgramDataBaseFileName="vc_mswu\controls.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\controls.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\controls.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\controls\"
ObjectFile="vc_mswud\controls\"
ProgramDataBaseFileName="vc_mswud\controls.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\controls.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\controls.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\controls.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\controls.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/controls/makefile.bcc b/samples/controls/makefile.bcc
index ff56d2c3f6..21fcd15b2a 100644
--- a/samples/controls/makefile.bcc
+++ b/samples/controls/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\controls.ils del $(OBJS)\controls.ils
$(OBJS)\controls.exe: $(CONTROLS_OBJECTS) $(OBJS)\controls_controls.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/controls/makefile.gcc b/samples/controls/makefile.gcc
index 694c1b9b84..c2b2992cc7 100644
--- a/samples/controls/makefile.gcc
+++ b/samples/controls/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\controls.exe del $(OBJS)\controls.exe
$(OBJS)\controls.exe: $(CONTROLS_OBJECTS) $(OBJS)\controls_controls_rc.o
- $(CXX) -o $@ $(CONTROLS_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
data:
if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/controls/makefile.unx b/samples/controls/makefile.unx
index 5436f7fb35..e5583c51e6 100644
--- a/samples/controls/makefile.unx
+++ b/samples/controls/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild controls
-install: all
+install:
uninstall:
diff --git a/samples/controls/makefile.vc b/samples/controls/makefile.vc
index 34f009a84e..2c39831cae 100644
--- a/samples/controls/makefile.vc
+++ b/samples/controls/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\controls.pdb del $(OBJS)\controls.pdb
$(OBJS)\controls.exe: $(CONTROLS_OBJECTS) $(OBJS)\controls_controls.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\controls.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\controls.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/controls/makefile.wat b/samples/controls/makefile.wat
index 528fcafaa4..ebba302f2d 100644
--- a/samples/controls/makefile.wat
+++ b/samples/controls/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\controls.exe : $(CONTROLS_OBJECTS) $(OBJS)\controls_controls.res
@%append $(OBJS)\controls.lbc option quiet
@%append $(OBJS)\controls.lbc name $^@
@%append $(OBJS)\controls.lbc option caseexact
- @%append $(OBJS)\controls.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\controls.lbc library %i
@%append $(OBJS)\controls.lbc option resource=$(OBJS)\controls_controls.res
diff --git a/samples/dataview/Makefile.in b/samples/dataview/Makefile.in
index 8779492196..a97ff63e5b 100644
--- a/samples/dataview/Makefile.in
+++ b/samples/dataview/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -61,7 +61,7 @@ DATAVIEW_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -115,28 +115,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: dataview$(EXEEXT) $(__dataview_bundle___depname)
-install: all
+install:
uninstall:
@@ -152,7 +152,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
dataview$(EXEEXT): $(DATAVIEW_OBJECTS) $(__dataview___win32rc)
- $(CXX) -o $@ $(DATAVIEW_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
+ $(CXX) -o $@ $(DATAVIEW_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
$(__dataview___mac_setfilecmd)
$(__dataview___os2_emxbindcmd)
@@ -197,6 +197,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean dataview_bundle
diff --git a/samples/dataview/dataview_vc7.vcproj b/samples/dataview/dataview_vc7.vcproj
index cfc4d54224..5ae668e8a3 100644
--- a/samples/dataview/dataview_vc7.vcproj
+++ b/samples/dataview/dataview_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\dataview"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\dataview\"
ObjectFile="vc_mswunivudll\dataview\"
ProgramDataBaseFileName="vc_mswunivudll\dataview.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\dataview.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\dataview.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\dataview_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\dataview"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\dataview\"
ObjectFile="vc_mswunivuddll\dataview\"
ProgramDataBaseFileName="vc_mswunivuddll\dataview.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivuddll\dataview.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\dataview.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\dataview_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\dataview"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\dataview\"
ObjectFile="vc_mswudll\dataview\"
ProgramDataBaseFileName="vc_mswudll\dataview.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\dataview.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\dataview.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\dataview_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\dataview"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\dataview\"
ObjectFile="vc_mswuddll\dataview\"
ProgramDataBaseFileName="vc_mswuddll\dataview.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswuddll\dataview.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\dataview.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\dataview_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\dataview"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\dataview\"
ObjectFile="vc_mswunivu\dataview\"
ProgramDataBaseFileName="vc_mswunivu\dataview.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\dataview.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\dataview.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\dataview_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\dataview"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\dataview\"
ObjectFile="vc_mswunivud\dataview\"
ProgramDataBaseFileName="vc_mswunivud\dataview.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivud\dataview.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\dataview.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\dataview_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\dataview"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\dataview\"
ObjectFile="vc_mswu\dataview\"
ProgramDataBaseFileName="vc_mswu\dataview.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\dataview.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\dataview.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\dataview_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\dataview"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\dataview\"
ObjectFile="vc_mswud\dataview\"
ProgramDataBaseFileName="vc_mswud\dataview.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswud\dataview.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\dataview.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\dataview_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\dataview.cpp"/>
+ RelativePath=".\dataview.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\..\sample.rc"/>
+ RelativePath=".\..\sample.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/dataview/dataview_vc8.vcproj b/samples/dataview/dataview_vc8.vcproj
index 20d55bc5ca..7108742304 100644
--- a/samples/dataview/dataview_vc8.vcproj
+++ b/samples/dataview/dataview_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\dataview\"
ObjectFile="vc_mswunivudll\dataview\"
ProgramDataBaseFileName="vc_mswunivudll\dataview.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\dataview.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\dataview.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\dataview\"
ObjectFile="vc_mswunivuddll\dataview\"
ProgramDataBaseFileName="vc_mswunivuddll\dataview.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivuddll\dataview.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\dataview.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\dataview\"
ObjectFile="vc_mswudll\dataview\"
ProgramDataBaseFileName="vc_mswudll\dataview.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\dataview.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\dataview.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\dataview\"
ObjectFile="vc_mswuddll\dataview\"
ProgramDataBaseFileName="vc_mswuddll\dataview.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswuddll\dataview.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\dataview.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\dataview\"
ObjectFile="vc_mswunivu\dataview\"
ProgramDataBaseFileName="vc_mswunivu\dataview.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\dataview.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\dataview.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\dataview\"
ObjectFile="vc_mswunivud\dataview\"
ProgramDataBaseFileName="vc_mswunivud\dataview.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivud\dataview.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\dataview.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\dataview\"
ObjectFile="vc_mswu\dataview\"
ProgramDataBaseFileName="vc_mswu\dataview.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\dataview.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\dataview.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\dataview\"
ObjectFile="vc_mswud\dataview\"
ProgramDataBaseFileName="vc_mswud\dataview.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswud\dataview.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\dataview.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\dataview.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\..\sample.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/dataview/makefile.bcc b/samples/dataview/makefile.bcc
index e1041dbe84..83521e9948 100644
--- a/samples/dataview/makefile.bcc
+++ b/samples/dataview/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -233,7 +233,7 @@ clean:
-if exist $(OBJS)\dataview.ils del $(OBJS)\dataview.ils
$(OBJS)\dataview.exe: $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/dataview/makefile.gcc b/samples/dataview/makefile.gcc
index b4166204dd..ea87d22c57 100644
--- a/samples/dataview/makefile.gcc
+++ b/samples/dataview/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -228,7 +228,7 @@ clean:
-if exist $(OBJS)\dataview.exe del $(OBJS)\dataview.exe
$(OBJS)\dataview.exe: $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample_rc.o
- $(CXX) -o $@ $(DATAVIEW_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(OBJS)\dataview_dataview.o: ./dataview.cpp
$(CXX) -c -o $@ $(DATAVIEW_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/dataview/makefile.unx b/samples/dataview/makefile.unx
index d6b8e2356f..73db99a216 100644
--- a/samples/dataview/makefile.unx
+++ b/samples/dataview/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild dataview
-install: all
+install:
uninstall:
diff --git a/samples/dataview/makefile.vc b/samples/dataview/makefile.vc
index 21a0c51cbd..17e0ecd5c4 100644
--- a/samples/dataview/makefile.vc
+++ b/samples/dataview/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -309,7 +309,7 @@ clean:
-if exist $(OBJS)\dataview.pdb del $(OBJS)\dataview.pdb
$(OBJS)\dataview.exe: $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\dataview.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\dataview.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/dataview/makefile.wat b/samples/dataview/makefile.wat
index ebcad92185..3da3207570 100644
--- a/samples/dataview/makefile.wat
+++ b/samples/dataview/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -256,7 +256,7 @@ $(OBJS)\dataview.exe : $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample.res
@%append $(OBJS)\dataview.lbc option quiet
@%append $(OBJS)\dataview.lbc name $^@
@%append $(OBJS)\dataview.lbc option caseexact
- @%append $(OBJS)\dataview.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\dataview.lbc library %i
@%append $(OBJS)\dataview.lbc option resource=$(OBJS)\dataview_sample.res
diff --git a/samples/debugrpt/Makefile.in b/samples/debugrpt/Makefile.in
index b762ee3bd2..ea7f70e4ff 100644
--- a/samples/debugrpt/Makefile.in
+++ b/samples/debugrpt/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -60,7 +60,7 @@ DEBUGRPT_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -117,28 +117,28 @@ COND_MONOLITHIC_0___WXLIB_XML_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: debugrpt$(EXEEXT) $(__debugrpt_bundle___depname)
-install: all
+install:
uninstall:
@@ -154,7 +154,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
debugrpt$(EXEEXT): $(DEBUGRPT_OBJECTS) $(__debugrpt___win32rc)
- $(CXX) -o $@ $(DEBUGRPT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_QA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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)
+ $(CXX) -o $@ $(DEBUGRPT_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_QA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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)
$(__debugrpt___mac_setfilecmd)
$(__debugrpt___os2_emxbindcmd)
@@ -199,6 +199,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean debugrpt_bundle
diff --git a/samples/debugrpt/debugrpt_vc7.vcproj b/samples/debugrpt/debugrpt_vc7.vcproj
index 7ecda6b65d..d8de685e38 100644
--- a/samples/debugrpt/debugrpt_vc7.vcproj
+++ b/samples/debugrpt/debugrpt_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\debugrpt"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\debugrpt\"
ObjectFile="vc_mswunivudll\debugrpt\"
ProgramDataBaseFileName="vc_mswunivudll\debugrpt.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\debugrpt.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\debugrpt.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\debugrpt_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\debugrpt"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\debugrpt\"
ObjectFile="vc_mswunivuddll\debugrpt\"
ProgramDataBaseFileName="vc_mswunivuddll\debugrpt.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_qa.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxbase29ud_xml.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_qa.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxbase29ud_xml.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"
OutputFile="vc_mswunivuddll\debugrpt.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\debugrpt.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\debugrpt_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\debugrpt"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\debugrpt\"
ObjectFile="vc_mswudll\debugrpt\"
ProgramDataBaseFileName="vc_mswudll\debugrpt.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\debugrpt.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\debugrpt.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\debugrpt_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\debugrpt"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\debugrpt\"
ObjectFile="vc_mswuddll\debugrpt\"
ProgramDataBaseFileName="vc_mswuddll\debugrpt.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_qa.lib wxmsw29ud_core.lib wxbase29ud.lib wxbase29ud_xml.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_qa.lib wxmsw29ud_core.lib wxbase29ud.lib wxbase29ud_xml.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"
OutputFile="vc_mswuddll\debugrpt.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\debugrpt.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\debugrpt_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\debugrpt"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\debugrpt\"
ObjectFile="vc_mswunivu\debugrpt\"
ProgramDataBaseFileName="vc_mswunivu\debugrpt.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\debugrpt.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\debugrpt.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\debugrpt_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\debugrpt"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\debugrpt\"
ObjectFile="vc_mswunivud\debugrpt\"
ProgramDataBaseFileName="vc_mswunivud\debugrpt.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_qa.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxbase29ud_xml.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_qa.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxbase29ud_xml.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"
OutputFile="vc_mswunivud\debugrpt.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\debugrpt.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\debugrpt_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\debugrpt"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\debugrpt\"
ObjectFile="vc_mswu\debugrpt\"
ProgramDataBaseFileName="vc_mswu\debugrpt.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\debugrpt.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\debugrpt.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\debugrpt_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\debugrpt"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\debugrpt\"
ObjectFile="vc_mswud\debugrpt\"
ProgramDataBaseFileName="vc_mswud\debugrpt.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_qa.lib wxmsw29ud_core.lib wxbase29ud.lib wxbase29ud_xml.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_qa.lib wxmsw29ud_core.lib wxbase29ud.lib wxbase29ud_xml.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"
OutputFile="vc_mswud\debugrpt.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\debugrpt.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\debugrpt_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\debugrpt.cpp"/>
+ RelativePath=".\debugrpt.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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"/>
+ RelativePath=".\..\..\samples\sample.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/debugrpt/debugrpt_vc8.vcproj b/samples/debugrpt/debugrpt_vc8.vcproj
index c9b4e4c485..2468ff2ff4 100644
--- a/samples/debugrpt/debugrpt_vc8.vcproj
+++ b/samples/debugrpt/debugrpt_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\debugrpt\"
ObjectFile="vc_mswunivudll\debugrpt\"
ProgramDataBaseFileName="vc_mswunivudll\debugrpt.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\debugrpt.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\debugrpt.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\debugrpt\"
ObjectFile="vc_mswunivuddll\debugrpt\"
ProgramDataBaseFileName="vc_mswunivuddll\debugrpt.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_qa.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxbase29ud_xml.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_qa.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxbase29ud_xml.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"
OutputFile="vc_mswunivuddll\debugrpt.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\debugrpt.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\debugrpt\"
ObjectFile="vc_mswudll\debugrpt\"
ProgramDataBaseFileName="vc_mswudll\debugrpt.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\debugrpt.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\debugrpt.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\debugrpt\"
ObjectFile="vc_mswuddll\debugrpt\"
ProgramDataBaseFileName="vc_mswuddll\debugrpt.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_qa.lib wxmsw29ud_core.lib wxbase29ud.lib wxbase29ud_xml.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_qa.lib wxmsw29ud_core.lib wxbase29ud.lib wxbase29ud_xml.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"
OutputFile="vc_mswuddll\debugrpt.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\debugrpt.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\debugrpt\"
ObjectFile="vc_mswunivu\debugrpt\"
ProgramDataBaseFileName="vc_mswunivu\debugrpt.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\debugrpt.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\debugrpt.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\debugrpt\"
ObjectFile="vc_mswunivud\debugrpt\"
ProgramDataBaseFileName="vc_mswunivud\debugrpt.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_qa.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxbase29ud_xml.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_qa.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxbase29ud_xml.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"
OutputFile="vc_mswunivud\debugrpt.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\debugrpt.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\debugrpt\"
ObjectFile="vc_mswu\debugrpt\"
ProgramDataBaseFileName="vc_mswu\debugrpt.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\debugrpt.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\debugrpt.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\debugrpt\"
ObjectFile="vc_mswud\debugrpt\"
ProgramDataBaseFileName="vc_mswud\debugrpt.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_qa.lib wxmsw29ud_core.lib wxbase29ud.lib wxbase29ud_xml.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_qa.lib wxmsw29ud_core.lib wxbase29ud.lib wxbase29ud_xml.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"
OutputFile="vc_mswud\debugrpt.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\debugrpt.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\debugrpt.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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>
diff --git a/samples/debugrpt/makefile.bcc b/samples/debugrpt/makefile.bcc
index 75653e1962..eeeb322424 100644
--- a/samples/debugrpt/makefile.bcc
+++ b/samples/debugrpt/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -237,7 +237,7 @@ clean:
-if exist $(OBJS)\debugrpt.ils del $(OBJS)\debugrpt.ils
$(OBJS)\debugrpt.exe: $(DEBUGRPT_OBJECTS) $(OBJS)\debugrpt_sample.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/debugrpt/makefile.gcc b/samples/debugrpt/makefile.gcc
index 42b4a7363d..6150657b14 100644
--- a/samples/debugrpt/makefile.gcc
+++ b/samples/debugrpt/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -232,7 +232,7 @@ clean:
-if exist $(OBJS)\debugrpt.exe del $(OBJS)\debugrpt.exe
$(OBJS)\debugrpt.exe: $(DEBUGRPT_OBJECTS) $(OBJS)\debugrpt_sample_rc.o
- $(CXX) -o $@ $(DEBUGRPT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(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
diff --git a/samples/debugrpt/makefile.unx b/samples/debugrpt/makefile.unx
index 825b9d4201..69b6d959ef 100644
--- a/samples/debugrpt/makefile.unx
+++ b/samples/debugrpt/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild debugrpt
-install: all
+install:
uninstall:
diff --git a/samples/debugrpt/makefile.vc b/samples/debugrpt/makefile.vc
index dfa50f5a9d..6182956949 100644
--- a/samples/debugrpt/makefile.vc
+++ b/samples/debugrpt/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -313,7 +313,7 @@ clean:
-if exist $(OBJS)\debugrpt.pdb del $(OBJS)\debugrpt.pdb
$(OBJS)\debugrpt.exe: $(DEBUGRPT_OBJECTS) $(OBJS)\debugrpt_sample.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\debugrpt.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\debugrpt.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/debugrpt/makefile.wat b/samples/debugrpt/makefile.wat
index d129d9b10f..b9ad5e4081 100644
--- a/samples/debugrpt/makefile.wat
+++ b/samples/debugrpt/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -261,7 +261,7 @@ $(OBJS)\debugrpt.exe : $(DEBUGRPT_OBJECTS) $(OBJS)\debugrpt_sample.res
@%append $(OBJS)\debugrpt.lbc option quiet
@%append $(OBJS)\debugrpt.lbc name $^@
@%append $(OBJS)\debugrpt.lbc option caseexact
- @%append $(OBJS)\debugrpt.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\debugrpt.lbc library %i
@%append $(OBJS)\debugrpt.lbc option resource=$(OBJS)\debugrpt_sample.res
diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in
index f7ad247690..c91f68a128 100644
--- a/samples/dialogs/Makefile.in
+++ b/samples/dialogs/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -62,7 +62,7 @@ DIALOGS_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -126,28 +126,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: dialogs$(EXEEXT) $(__dialogs_bundle___depname) data
-install: all
+install:
uninstall:
@@ -163,7 +163,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
dialogs$(EXEEXT): $(DIALOGS_OBJECTS) $(__dialogs___win32rc)
- $(CXX) -o $@ $(DIALOGS_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
+ $(CXX) -o $@ $(DIALOGS_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
$(__dialogs___mac_setfilecmd)
$(__dialogs___os2_emxbindcmd)
@@ -250,6 +250,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean dialogs_bundle data
diff --git a/samples/dialogs/dialogs_vc7.vcproj b/samples/dialogs/dialogs_vc7.vcproj
index d71bf2f56d..9555288d3a 100644
--- a/samples/dialogs/dialogs_vc7.vcproj
+++ b/samples/dialogs/dialogs_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\dialogs"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\dialogs\"
ObjectFile="vc_mswunivudll\dialogs\"
ProgramDataBaseFileName="vc_mswunivudll\dialogs.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\dialogs.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\dialogs.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\dialogs_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\dialogs"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\dialogs\"
ObjectFile="vc_mswunivuddll\dialogs\"
ProgramDataBaseFileName="vc_mswunivuddll\dialogs.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivuddll\dialogs.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\dialogs.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\dialogs_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\dialogs"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\dialogs\"
ObjectFile="vc_mswudll\dialogs\"
ProgramDataBaseFileName="vc_mswudll\dialogs.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\dialogs.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\dialogs.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\dialogs_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\dialogs"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\dialogs\"
ObjectFile="vc_mswuddll\dialogs\"
ProgramDataBaseFileName="vc_mswuddll\dialogs.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswuddll\dialogs.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\dialogs.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\dialogs_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\dialogs"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\dialogs\"
ObjectFile="vc_mswunivu\dialogs\"
ProgramDataBaseFileName="vc_mswunivu\dialogs.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\dialogs.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\dialogs.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\dialogs_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\dialogs"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\dialogs\"
ObjectFile="vc_mswunivud\dialogs\"
ProgramDataBaseFileName="vc_mswunivud\dialogs.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivud\dialogs.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\dialogs.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\dialogs_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\dialogs"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\dialogs\"
ObjectFile="vc_mswu\dialogs\"
ProgramDataBaseFileName="vc_mswu\dialogs.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\dialogs.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\dialogs.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\dialogs_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\dialogs"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\dialogs\"
ObjectFile="vc_mswud\dialogs\"
ProgramDataBaseFileName="vc_mswud\dialogs.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswud\dialogs.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\dialogs.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\dialogs_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,101 +523,103 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
RelativePath=".\..\..\src\generic\colrdlgg.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
- RelativePath=".\dialogs.cpp"/>
+ RelativePath=".\dialogs.cpp">
+ </File>
<File
RelativePath=".\..\..\src\generic\dirdlgg.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath=".\..\..\src\generic\filedlgg.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath=".\..\..\src\generic\fontdlgg.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
- ExcludedFromBuild="true"/>
+ ExcludedFromBuild="TRUE"/>
</File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\dialogs.rc"/>
+ RelativePath=".\dialogs.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/dialogs/dialogs_vc8.vcproj b/samples/dialogs/dialogs_vc8.vcproj
index c4b62fcff5..d000e56e43 100644
--- a/samples/dialogs/dialogs_vc8.vcproj
+++ b/samples/dialogs/dialogs_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\dialogs\"
ObjectFile="vc_mswunivudll\dialogs\"
ProgramDataBaseFileName="vc_mswunivudll\dialogs.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\dialogs.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\dialogs.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\dialogs\"
ObjectFile="vc_mswunivuddll\dialogs\"
ProgramDataBaseFileName="vc_mswunivuddll\dialogs.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivuddll\dialogs.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\dialogs.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\dialogs\"
ObjectFile="vc_mswudll\dialogs\"
ProgramDataBaseFileName="vc_mswudll\dialogs.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\dialogs.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\dialogs.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\dialogs\"
ObjectFile="vc_mswuddll\dialogs\"
ProgramDataBaseFileName="vc_mswuddll\dialogs.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswuddll\dialogs.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\dialogs.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\dialogs\"
ObjectFile="vc_mswunivu\dialogs\"
ProgramDataBaseFileName="vc_mswunivu\dialogs.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\dialogs.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\dialogs.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\dialogs\"
ObjectFile="vc_mswunivud\dialogs\"
ProgramDataBaseFileName="vc_mswunivud\dialogs.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivud\dialogs.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\dialogs.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\dialogs\"
ObjectFile="vc_mswu\dialogs\"
ProgramDataBaseFileName="vc_mswu\dialogs.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\dialogs.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\dialogs.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\dialogs\"
ObjectFile="vc_mswud\dialogs\"
ProgramDataBaseFileName="vc_mswud\dialogs.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswud\dialogs.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\dialogs.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,8 +784,8 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\..\..\src\generic\colrdlgg.cpp"
@@ -813,7 +817,8 @@
</File>
<File
RelativePath=".\dialogs.cpp"
- />
+ >
+ </File>
<File
RelativePath=".\..\..\src\generic\dirdlgg.cpp"
>
@@ -901,12 +906,13 @@
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\dialogs.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/dialogs/makefile.bcc b/samples/dialogs/makefile.bcc
index ae3850dca1..a8f0802e54 100644
--- a/samples/dialogs/makefile.bcc
+++ b/samples/dialogs/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -241,7 +241,7 @@ clean:
-if exist $(OBJS)\dialogs.ils del $(OBJS)\dialogs.ils
$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/dialogs/makefile.gcc b/samples/dialogs/makefile.gcc
index a4e50e423b..e60dc26146 100644
--- a/samples/dialogs/makefile.gcc
+++ b/samples/dialogs/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -238,7 +238,7 @@ clean:
-if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe
$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs_rc.o
- $(CXX) -o $@ $(DIALOGS_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
data:
if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/dialogs/makefile.unx b/samples/dialogs/makefile.unx
index 19306cef7e..19a83657a8 100644
--- a/samples/dialogs/makefile.unx
+++ b/samples/dialogs/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild dialogs
-install: all
+install:
uninstall:
diff --git a/samples/dialogs/makefile.vc b/samples/dialogs/makefile.vc
index 537d16e460..acaa0891ef 100644
--- a/samples/dialogs/makefile.vc
+++ b/samples/dialogs/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -53,18 +53,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -74,18 +74,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -317,7 +317,7 @@ clean:
-if exist $(OBJS)\dialogs.pdb del $(OBJS)\dialogs.pdb
$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\dialogs.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\dialogs.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/dialogs/makefile.wat b/samples/dialogs/makefile.wat
index fa77972e3c..6224c7fc8d 100644
--- a/samples/dialogs/makefile.wat
+++ b/samples/dialogs/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -267,7 +267,7 @@ $(OBJS)\dialogs.exe : $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs.res
@%append $(OBJS)\dialogs.lbc option quiet
@%append $(OBJS)\dialogs.lbc name $^@
@%append $(OBJS)\dialogs.lbc option caseexact
- @%append $(OBJS)\dialogs.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\dialogs.lbc library %i
@%append $(OBJS)\dialogs.lbc option resource=$(OBJS)\dialogs_dialogs.res
diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in
index b7a640d53a..2f31ccea93 100644
--- a/samples/dialup/Makefile.in
+++ b/samples/dialup/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ NETTEST_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -112,28 +112,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: $(__nettest___depname) $(__nettest_bundle___depname)
-install: all
+install:
uninstall:
@@ -149,7 +149,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
@COND_PLATFORM_MSDOS_0@nettest$(EXEEXT): $(NETTEST_OBJECTS) $(__nettest___win32rc)
-@COND_PLATFORM_MSDOS_0@ $(CXX) -o $@ $(NETTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+@COND_PLATFORM_MSDOS_0@ $(CXX) -o $@ $(NETTEST_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)
@COND_PLATFORM_MSDOS_0@
@COND_PLATFORM_MSDOS_0@ $(__nettest___mac_setfilecmd)
@COND_PLATFORM_MSDOS_0@ $(__nettest___os2_emxbindcmd)
@@ -194,6 +194,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean nettest_bundle
diff --git a/samples/dialup/dialup_vc7.vcproj b/samples/dialup/dialup_vc7.vcproj
index 06d7c3c7bb..ac02b95398 100644
--- a/samples/dialup/dialup_vc7.vcproj
+++ b/samples/dialup/dialup_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\nettest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\nettest\"
ObjectFile="vc_mswunivudll\nettest\"
ProgramDataBaseFileName="vc_mswunivudll\nettest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\nettest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\nettest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\dialup_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\nettest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\nettest\"
ObjectFile="vc_mswunivuddll\nettest\"
ProgramDataBaseFileName="vc_mswunivuddll\nettest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\nettest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\nettest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\dialup_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\nettest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\nettest\"
ObjectFile="vc_mswudll\nettest\"
ProgramDataBaseFileName="vc_mswudll\nettest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\nettest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\nettest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\dialup_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\nettest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\nettest\"
ObjectFile="vc_mswuddll\nettest\"
ProgramDataBaseFileName="vc_mswuddll\nettest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\nettest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\nettest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\dialup_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\nettest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\nettest\"
ObjectFile="vc_mswunivu\nettest\"
ProgramDataBaseFileName="vc_mswunivu\nettest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\nettest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\nettest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\dialup_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\nettest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\nettest\"
ObjectFile="vc_mswunivud\nettest\"
ProgramDataBaseFileName="vc_mswunivud\nettest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\nettest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\nettest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\dialup_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\nettest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\nettest\"
ObjectFile="vc_mswu\nettest\"
ProgramDataBaseFileName="vc_mswu\nettest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\nettest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\nettest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\dialup_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\nettest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\nettest\"
ObjectFile="vc_mswud\nettest\"
ProgramDataBaseFileName="vc_mswud\nettest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\nettest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\nettest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\dialup_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\nettest.cpp"/>
+ RelativePath=".\nettest.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\nettest.rc"/>
+ RelativePath=".\nettest.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/dialup/dialup_vc8.vcproj b/samples/dialup/dialup_vc8.vcproj
index 37e21e9d27..1a1de33299 100644
--- a/samples/dialup/dialup_vc8.vcproj
+++ b/samples/dialup/dialup_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\nettest\"
ObjectFile="vc_mswunivudll\nettest\"
ProgramDataBaseFileName="vc_mswunivudll\nettest.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\nettest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\nettest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\nettest\"
ObjectFile="vc_mswunivuddll\nettest\"
ProgramDataBaseFileName="vc_mswunivuddll\nettest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\nettest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\nettest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\nettest\"
ObjectFile="vc_mswudll\nettest\"
ProgramDataBaseFileName="vc_mswudll\nettest.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\nettest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\nettest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\nettest\"
ObjectFile="vc_mswuddll\nettest\"
ProgramDataBaseFileName="vc_mswuddll\nettest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\nettest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\nettest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\nettest\"
ObjectFile="vc_mswunivu\nettest\"
ProgramDataBaseFileName="vc_mswunivu\nettest.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\nettest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\nettest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\nettest\"
ObjectFile="vc_mswunivud\nettest\"
ProgramDataBaseFileName="vc_mswunivud\nettest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\nettest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\nettest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\nettest\"
ObjectFile="vc_mswu\nettest\"
ProgramDataBaseFileName="vc_mswu\nettest.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\nettest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\nettest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\nettest\"
ObjectFile="vc_mswud\nettest\"
ProgramDataBaseFileName="vc_mswud\nettest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\nettest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\nettest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\nettest.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\nettest.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/dialup/makefile.bcc b/samples/dialup/makefile.bcc
index 48bb186198..faf74c3f5a 100644
--- a/samples/dialup/makefile.bcc
+++ b/samples/dialup/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\nettest.ils del $(OBJS)\nettest.ils
$(OBJS)\nettest.exe: $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/dialup/makefile.gcc b/samples/dialup/makefile.gcc
index 5d06a9e53a..3c0a827562 100644
--- a/samples/dialup/makefile.gcc
+++ b/samples/dialup/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\nettest.exe del $(OBJS)\nettest.exe
$(OBJS)\nettest.exe: $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest_rc.o
- $(CXX) -o $@ $(NETTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(OBJS)\nettest_nettest.o: ./nettest.cpp
$(CXX) -c -o $@ $(NETTEST_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/dialup/makefile.unx b/samples/dialup/makefile.unx
index 67b5787e62..dd7c64084e 100644
--- a/samples/dialup/makefile.unx
+++ b/samples/dialup/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild nettest
-install: all
+install:
uninstall:
diff --git a/samples/dialup/makefile.vc b/samples/dialup/makefile.vc
index d65a65a6a6..2d6f532d45 100644
--- a/samples/dialup/makefile.vc
+++ b/samples/dialup/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\nettest.pdb del $(OBJS)\nettest.pdb
$(OBJS)\nettest.exe: $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\nettest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\nettest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/dialup/makefile.wat b/samples/dialup/makefile.wat
index b28dcbe9f9..e74155c556 100644
--- a/samples/dialup/makefile.wat
+++ b/samples/dialup/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\nettest.exe : $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest.res
@%append $(OBJS)\nettest.lbc option quiet
@%append $(OBJS)\nettest.lbc name $^@
@%append $(OBJS)\nettest.lbc option caseexact
- @%append $(OBJS)\nettest.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\nettest.lbc library %i
@%append $(OBJS)\nettest.lbc option resource=$(OBJS)\nettest_nettest.res
diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in
index c206b006a3..b517ca3b55 100644
--- a/samples/display/Makefile.in
+++ b/samples/display/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ DISPLAY_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: display$(EXEEXT) $(__display_bundle___depname)
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
display$(EXEEXT): $(DISPLAY_OBJECTS) $(__display___win32rc)
- $(CXX) -o $@ $(DISPLAY_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(DISPLAY_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)
$(__display___mac_setfilecmd)
$(__display___os2_emxbindcmd)
@@ -192,6 +192,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean display_bundle
diff --git a/samples/display/display_vc7.vcproj b/samples/display/display_vc7.vcproj
index 6a91597901..51f8e8e842 100644
--- a/samples/display/display_vc7.vcproj
+++ b/samples/display/display_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\display"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\display\"
ObjectFile="vc_mswunivudll\display\"
ProgramDataBaseFileName="vc_mswunivudll\display.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\display.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\display.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\display_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\display"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\display\"
ObjectFile="vc_mswunivuddll\display\"
ProgramDataBaseFileName="vc_mswunivuddll\display.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\display.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\display.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\display_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\display"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\display\"
ObjectFile="vc_mswudll\display\"
ProgramDataBaseFileName="vc_mswudll\display.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\display.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\display.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\display_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\display"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\display\"
ObjectFile="vc_mswuddll\display\"
ProgramDataBaseFileName="vc_mswuddll\display.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\display.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\display.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\display_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\display"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\display\"
ObjectFile="vc_mswunivu\display\"
ProgramDataBaseFileName="vc_mswunivu\display.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\display.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\display.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\display_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\display"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\display\"
ObjectFile="vc_mswunivud\display\"
ProgramDataBaseFileName="vc_mswunivud\display.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\display.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\display.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\display_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\display"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\display\"
ObjectFile="vc_mswu\display\"
ProgramDataBaseFileName="vc_mswu\display.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\display.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\display.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\display_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\display"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\display\"
ObjectFile="vc_mswud\display\"
ProgramDataBaseFileName="vc_mswud\display.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\display.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\display.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\display_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\display.cpp"/>
+ RelativePath=".\display.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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"/>
+ RelativePath=".\..\..\samples\sample.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/display/display_vc8.vcproj b/samples/display/display_vc8.vcproj
index 638e4455ee..e86bff1ba3 100644
--- a/samples/display/display_vc8.vcproj
+++ b/samples/display/display_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\display\"
ObjectFile="vc_mswunivudll\display\"
ProgramDataBaseFileName="vc_mswunivudll\display.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\display.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\display.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\display\"
ObjectFile="vc_mswunivuddll\display\"
ProgramDataBaseFileName="vc_mswunivuddll\display.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\display.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\display.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\display\"
ObjectFile="vc_mswudll\display\"
ProgramDataBaseFileName="vc_mswudll\display.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\display.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\display.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\display\"
ObjectFile="vc_mswuddll\display\"
ProgramDataBaseFileName="vc_mswuddll\display.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\display.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\display.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\display\"
ObjectFile="vc_mswunivu\display\"
ProgramDataBaseFileName="vc_mswunivu\display.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\display.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\display.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\display\"
ObjectFile="vc_mswunivud\display\"
ProgramDataBaseFileName="vc_mswunivud\display.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\display.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\display.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\display\"
ObjectFile="vc_mswu\display\"
ProgramDataBaseFileName="vc_mswu\display.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\display.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\display.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\display\"
ObjectFile="vc_mswud\display\"
ProgramDataBaseFileName="vc_mswud\display.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\display.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\display.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\display.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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>
diff --git a/samples/display/makefile.bcc b/samples/display/makefile.bcc
index a86623f50e..247ab7e874 100644
--- a/samples/display/makefile.bcc
+++ b/samples/display/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\display.ils del $(OBJS)\display.ils
$(OBJS)\display.exe: $(DISPLAY_OBJECTS) $(OBJS)\display_sample.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/display/makefile.gcc b/samples/display/makefile.gcc
index 020f2e7ee8..4542833752 100644
--- a/samples/display/makefile.gcc
+++ b/samples/display/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\display.exe del $(OBJS)\display.exe
$(OBJS)\display.exe: $(DISPLAY_OBJECTS) $(OBJS)\display_sample_rc.o
- $(CXX) -o $@ $(DISPLAY_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(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
diff --git a/samples/display/makefile.unx b/samples/display/makefile.unx
index 416d87161e..4f6dce718c 100644
--- a/samples/display/makefile.unx
+++ b/samples/display/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild display
-install: all
+install:
uninstall:
diff --git a/samples/display/makefile.vc b/samples/display/makefile.vc
index 6f4222abdf..18e95e35be 100644
--- a/samples/display/makefile.vc
+++ b/samples/display/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\display.pdb del $(OBJS)\display.pdb
$(OBJS)\display.exe: $(DISPLAY_OBJECTS) $(OBJS)\display_sample.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\display.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\display.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/display/makefile.wat b/samples/display/makefile.wat
index d88f7fa5a6..7a4f210248 100644
--- a/samples/display/makefile.wat
+++ b/samples/display/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\display.exe : $(DISPLAY_OBJECTS) $(OBJS)\display_sample.res
@%append $(OBJS)\display.lbc option quiet
@%append $(OBJS)\display.lbc name $^@
@%append $(OBJS)\display.lbc option caseexact
- @%append $(OBJS)\display.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\display.lbc library %i
@%append $(OBJS)\display.lbc option resource=$(OBJS)\display_sample.res
diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in
index bf3157208e..ddb566bb17 100644
--- a/samples/dnd/Makefile.in
+++ b/samples/dnd/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ DND_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: dnd$(EXEEXT) $(__dnd_bundle___depname) data
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
dnd$(EXEEXT): $(DND_OBJECTS) $(__dnd___win32rc)
- $(CXX) -o $@ $(DND_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(DND_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)
$(__dnd___mac_setfilecmd)
$(__dnd___os2_emxbindcmd)
@@ -204,6 +204,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean dnd_bundle data
diff --git a/samples/dnd/dnd_vc7.vcproj b/samples/dnd/dnd_vc7.vcproj
index 176352eab5..f7f2532556 100644
--- a/samples/dnd/dnd_vc7.vcproj
+++ b/samples/dnd/dnd_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\dnd"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\dnd\"
ObjectFile="vc_mswunivudll\dnd\"
ProgramDataBaseFileName="vc_mswunivudll\dnd.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\dnd.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\dnd.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\dnd_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\dnd"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\dnd\"
ObjectFile="vc_mswunivuddll\dnd\"
ProgramDataBaseFileName="vc_mswunivuddll\dnd.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\dnd.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\dnd.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\dnd_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\dnd"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\dnd\"
ObjectFile="vc_mswudll\dnd\"
ProgramDataBaseFileName="vc_mswudll\dnd.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\dnd.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\dnd.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\dnd_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\dnd"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\dnd\"
ObjectFile="vc_mswuddll\dnd\"
ProgramDataBaseFileName="vc_mswuddll\dnd.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\dnd.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\dnd.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\dnd_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\dnd"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\dnd\"
ObjectFile="vc_mswunivu\dnd\"
ProgramDataBaseFileName="vc_mswunivu\dnd.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\dnd.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\dnd.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\dnd_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\dnd"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\dnd\"
ObjectFile="vc_mswunivud\dnd\"
ProgramDataBaseFileName="vc_mswunivud\dnd.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\dnd.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\dnd.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\dnd_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\dnd"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\dnd\"
ObjectFile="vc_mswu\dnd\"
ProgramDataBaseFileName="vc_mswu\dnd.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\dnd.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\dnd.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\dnd_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\dnd"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\dnd\"
ObjectFile="vc_mswud\dnd\"
ProgramDataBaseFileName="vc_mswud\dnd.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\dnd.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\dnd.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\dnd_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\dnd.cpp"/>
+ RelativePath=".\dnd.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\dnd.rc"/>
+ RelativePath=".\dnd.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/dnd/dnd_vc8.vcproj b/samples/dnd/dnd_vc8.vcproj
index c69bf1cbe6..0bd3757e1d 100644
--- a/samples/dnd/dnd_vc8.vcproj
+++ b/samples/dnd/dnd_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\dnd\"
ObjectFile="vc_mswunivudll\dnd\"
ProgramDataBaseFileName="vc_mswunivudll\dnd.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\dnd.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\dnd.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\dnd\"
ObjectFile="vc_mswunivuddll\dnd\"
ProgramDataBaseFileName="vc_mswunivuddll\dnd.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\dnd.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\dnd.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\dnd\"
ObjectFile="vc_mswudll\dnd\"
ProgramDataBaseFileName="vc_mswudll\dnd.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\dnd.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\dnd.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\dnd\"
ObjectFile="vc_mswuddll\dnd\"
ProgramDataBaseFileName="vc_mswuddll\dnd.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\dnd.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\dnd.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\dnd\"
ObjectFile="vc_mswunivu\dnd\"
ProgramDataBaseFileName="vc_mswunivu\dnd.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\dnd.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\dnd.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\dnd\"
ObjectFile="vc_mswunivud\dnd\"
ProgramDataBaseFileName="vc_mswunivud\dnd.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\dnd.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\dnd.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\dnd\"
ObjectFile="vc_mswu\dnd\"
ProgramDataBaseFileName="vc_mswu\dnd.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\dnd.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\dnd.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\dnd\"
ObjectFile="vc_mswud\dnd\"
ProgramDataBaseFileName="vc_mswud\dnd.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\dnd.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\dnd.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\dnd.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\dnd.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/dnd/makefile.bcc b/samples/dnd/makefile.bcc
index dee6bee2c1..f5ffddf5ea 100644
--- a/samples/dnd/makefile.bcc
+++ b/samples/dnd/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\dnd.ils del $(OBJS)\dnd.ils
$(OBJS)\dnd.exe: $(DND_OBJECTS) $(OBJS)\dnd_dnd.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/dnd/makefile.gcc b/samples/dnd/makefile.gcc
index c5666e4beb..9effaedd03 100644
--- a/samples/dnd/makefile.gcc
+++ b/samples/dnd/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\dnd.exe del $(OBJS)\dnd.exe
$(OBJS)\dnd.exe: $(DND_OBJECTS) $(OBJS)\dnd_dnd_rc.o
- $(CXX) -o $@ $(DND_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
data:
if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/dnd/makefile.unx b/samples/dnd/makefile.unx
index f88ee4f33b..9c8f2d4757 100644
--- a/samples/dnd/makefile.unx
+++ b/samples/dnd/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild dnd
-install: all
+install:
uninstall:
diff --git a/samples/dnd/makefile.vc b/samples/dnd/makefile.vc
index cd5491373c..558dec6b24 100644
--- a/samples/dnd/makefile.vc
+++ b/samples/dnd/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\dnd.pdb del $(OBJS)\dnd.pdb
$(OBJS)\dnd.exe: $(DND_OBJECTS) $(OBJS)\dnd_dnd.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\dnd.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\dnd.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/dnd/makefile.wat b/samples/dnd/makefile.wat
index 2576fdd38c..bd3fa57bda 100644
--- a/samples/dnd/makefile.wat
+++ b/samples/dnd/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\dnd.exe : $(DND_OBJECTS) $(OBJS)\dnd_dnd.res
@%append $(OBJS)\dnd.lbc option quiet
@%append $(OBJS)\dnd.lbc name $^@
@%append $(OBJS)\dnd.lbc option caseexact
- @%append $(OBJS)\dnd.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\dnd.lbc library %i
@%append $(OBJS)\dnd.lbc option resource=$(OBJS)\dnd_dnd.res
diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in
index b8dd2f0aaf..06cf2d335d 100644
--- a/samples/docview/Makefile.in
+++ b/samples/docview/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -61,7 +61,7 @@ DOCVIEW_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -112,28 +112,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: docview$(EXEEXT) $(__docview_bundle___depname)
-install: all
+install:
uninstall:
@@ -149,7 +149,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
docview$(EXEEXT): $(DOCVIEW_OBJECTS) $(__docview___win32rc)
- $(CXX) -o $@ $(DOCVIEW_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(DOCVIEW_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)
$(__docview___mac_setfilecmd)
$(__docview___os2_emxbindcmd)
@@ -201,6 +201,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean docview_bundle
diff --git a/samples/docview/docview_vc7.vcproj b/samples/docview/docview_vc7.vcproj
index dbfece2e55..3e070b75c5 100644
--- a/samples/docview/docview_vc7.vcproj
+++ b/samples/docview/docview_vc7.vcproj
@@ -1,4 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
+<!--
+
+ This makefile was generated by
+ Bakefile 0.2.4 (http://www.bakefile.org)
+ Do not modify, all changes will be overwritten!
+
+-->
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
@@ -19,14 +26,10 @@
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=""
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- MinimalRebuild="FALSE"
ExceptionHandling="TRUE"
- BasicRuntimeChecks="3"
RuntimeLibrary="2"
RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\docview\"
@@ -84,15 +87,14 @@
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=""
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="TRUE"
ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\docview\"
ObjectFile="vc_mswunivuddll\docview\"
@@ -149,14 +151,10 @@
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=""
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- MinimalRebuild="FALSE"
ExceptionHandling="TRUE"
- BasicRuntimeChecks="3"
RuntimeLibrary="2"
RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\docview\"
@@ -214,15 +212,14 @@
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=""
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="TRUE"
ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\docview\"
ObjectFile="vc_mswuddll\docview\"
@@ -279,14 +276,10 @@
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=""
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- MinimalRebuild="FALSE"
ExceptionHandling="TRUE"
- BasicRuntimeChecks="3"
RuntimeLibrary="2"
RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\docview\"
@@ -344,15 +337,14 @@
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=""
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="TRUE"
ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\docview\"
ObjectFile="vc_mswunivud\docview\"
@@ -409,14 +401,10 @@
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=""
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- MinimalRebuild="FALSE"
ExceptionHandling="TRUE"
- BasicRuntimeChecks="3"
RuntimeLibrary="2"
RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\docview\"
@@ -474,7 +462,6 @@
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=""
Optimization="0"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
@@ -482,6 +469,7 @@
ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\docview\"
ObjectFile="vc_mswud\docview\"
@@ -530,6 +518,7 @@
</Configuration>
</Configurations>
<References>
+
</References>
<Files>
<Filter
@@ -556,5 +545,7 @@
</Filter>
</Files>
<Globals>
+
</Globals>
</VisualStudioProject>
+
diff --git a/samples/docview/docview_vc8.vcproj b/samples/docview/docview_vc8.vcproj
index ec42ae06ad..22ba8e5397 100644
--- a/samples/docview/docview_vc8.vcproj
+++ b/samples/docview/docview_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\docview\"
ObjectFile="vc_mswunivudll\docview\"
ProgramDataBaseFileName="vc_mswunivudll\docview.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\docview.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\docview.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\docview\"
ObjectFile="vc_mswunivuddll\docview\"
ProgramDataBaseFileName="vc_mswunivuddll\docview.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\docview.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\docview.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\docview\"
ObjectFile="vc_mswudll\docview\"
ProgramDataBaseFileName="vc_mswudll\docview.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\docview.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\docview.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\docview\"
ObjectFile="vc_mswuddll\docview\"
ProgramDataBaseFileName="vc_mswuddll\docview.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\docview.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\docview.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\docview\"
ObjectFile="vc_mswunivu\docview\"
ProgramDataBaseFileName="vc_mswunivu\docview.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\docview.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\docview.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\docview\"
ObjectFile="vc_mswunivud\docview\"
ProgramDataBaseFileName="vc_mswunivud\docview.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\docview.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\docview.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\docview\"
ObjectFile="vc_mswu\docview\"
ProgramDataBaseFileName="vc_mswu\docview.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\docview.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\docview.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\docview\"
ObjectFile="vc_mswud\docview\"
ProgramDataBaseFileName="vc_mswud\docview.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\docview.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\docview.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,27 +784,31 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\doc.cpp"
- />
+ >
+ </File>
<File
RelativePath=".\docview.cpp"
- />
+ >
+ </File>
<File
RelativePath=".\view.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\docview.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/docview/makefile.bcc b/samples/docview/makefile.bcc
index 4bab203f22..f84eae135d 100644
--- a/samples/docview/makefile.bcc
+++ b/samples/docview/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -231,7 +231,7 @@ clean:
-if exist $(OBJS)\docview.ils del $(OBJS)\docview.ils
$(OBJS)\docview.exe: $(DOCVIEW_OBJECTS) $(OBJS)\docview_docview.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/docview/makefile.gcc b/samples/docview/makefile.gcc
index 6a27ea1300..44f608cc52 100644
--- a/samples/docview/makefile.gcc
+++ b/samples/docview/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -226,7 +226,7 @@ clean:
-if exist $(OBJS)\docview.exe del $(OBJS)\docview.exe
$(OBJS)\docview.exe: $(DOCVIEW_OBJECTS) $(OBJS)\docview_docview_rc.o
- $(CXX) -o $@ $(DOCVIEW_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(OBJS)\docview_docview.o: ./docview.cpp
$(CXX) -c -o $@ $(DOCVIEW_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/docview/makefile.unx b/samples/docview/makefile.unx
index c146d114a5..8dd4527d29 100644
--- a/samples/docview/makefile.unx
+++ b/samples/docview/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -87,7 +87,7 @@ endif
all: test_for_selected_wxbuild docview
-install: all
+install:
uninstall:
diff --git a/samples/docview/makefile.vc b/samples/docview/makefile.vc
index e149507d16..df3282aded 100644
--- a/samples/docview/makefile.vc
+++ b/samples/docview/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -54,18 +54,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -75,18 +75,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -307,7 +307,7 @@ clean:
-if exist $(OBJS)\docview.pdb del $(OBJS)\docview.pdb
$(OBJS)\docview.exe: $(DOCVIEW_OBJECTS) $(OBJS)\docview_docview.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\docview.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\docview.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/docview/makefile.wat b/samples/docview/makefile.wat
index 15a1e3df3f..63362e9c01 100644
--- a/samples/docview/makefile.wat
+++ b/samples/docview/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -253,7 +253,7 @@ $(OBJS)\docview.exe : $(DOCVIEW_OBJECTS) $(OBJS)\docview_docview.res
@%append $(OBJS)\docview.lbc option quiet
@%append $(OBJS)\docview.lbc name $^@
@%append $(OBJS)\docview.lbc option caseexact
- @%append $(OBJS)\docview.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\docview.lbc library %i
@%append $(OBJS)\docview.lbc option resource=$(OBJS)\docview_docview.res
diff --git a/samples/dragimag/Makefile.in b/samples/dragimag/Makefile.in
index ffdf576f19..7fd0b7acb7 100644
--- a/samples/dragimag/Makefile.in
+++ b/samples/dragimag/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ DRAGIMAG_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: dragimag$(EXEEXT) $(__dragimag_bundle___depname) data
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
dragimag$(EXEEXT): $(DRAGIMAG_OBJECTS) $(__dragimag___win32rc)
- $(CXX) -o $@ $(DRAGIMAG_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(DRAGIMAG_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)
$(__dragimag___mac_setfilecmd)
$(__dragimag___os2_emxbindcmd)
@@ -204,6 +204,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean dragimag_bundle data
diff --git a/samples/dragimag/dragimag_vc7.vcproj b/samples/dragimag/dragimag_vc7.vcproj
index 7d79ce1df3..99959fca13 100644
--- a/samples/dragimag/dragimag_vc7.vcproj
+++ b/samples/dragimag/dragimag_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\dragimag"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\dragimag\"
ObjectFile="vc_mswunivudll\dragimag\"
ProgramDataBaseFileName="vc_mswunivudll\dragimag.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\dragimag.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\dragimag.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\dragimag_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\dragimag"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\dragimag\"
ObjectFile="vc_mswunivuddll\dragimag\"
ProgramDataBaseFileName="vc_mswunivuddll\dragimag.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\dragimag.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\dragimag.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\dragimag_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\dragimag"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\dragimag\"
ObjectFile="vc_mswudll\dragimag\"
ProgramDataBaseFileName="vc_mswudll\dragimag.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\dragimag.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\dragimag.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\dragimag_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\dragimag"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\dragimag\"
ObjectFile="vc_mswuddll\dragimag\"
ProgramDataBaseFileName="vc_mswuddll\dragimag.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\dragimag.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\dragimag.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\dragimag_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\dragimag"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\dragimag\"
ObjectFile="vc_mswunivu\dragimag\"
ProgramDataBaseFileName="vc_mswunivu\dragimag.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\dragimag.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\dragimag.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\dragimag_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\dragimag"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\dragimag\"
ObjectFile="vc_mswunivud\dragimag\"
ProgramDataBaseFileName="vc_mswunivud\dragimag.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\dragimag.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\dragimag.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\dragimag_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\dragimag"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\dragimag\"
ObjectFile="vc_mswu\dragimag\"
ProgramDataBaseFileName="vc_mswu\dragimag.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\dragimag.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\dragimag.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\dragimag_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\dragimag"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\dragimag\"
ObjectFile="vc_mswud\dragimag\"
ProgramDataBaseFileName="vc_mswud\dragimag.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\dragimag.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\dragimag.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\dragimag_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\dragimag.cpp"/>
+ RelativePath=".\dragimag.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\dragimag.rc"/>
+ RelativePath=".\dragimag.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/dragimag/dragimag_vc8.vcproj b/samples/dragimag/dragimag_vc8.vcproj
index 2d658d74e4..6433f39ad2 100644
--- a/samples/dragimag/dragimag_vc8.vcproj
+++ b/samples/dragimag/dragimag_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\dragimag\"
ObjectFile="vc_mswunivudll\dragimag\"
ProgramDataBaseFileName="vc_mswunivudll\dragimag.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\dragimag.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\dragimag.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\dragimag\"
ObjectFile="vc_mswunivuddll\dragimag\"
ProgramDataBaseFileName="vc_mswunivuddll\dragimag.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\dragimag.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\dragimag.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\dragimag\"
ObjectFile="vc_mswudll\dragimag\"
ProgramDataBaseFileName="vc_mswudll\dragimag.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\dragimag.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\dragimag.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\dragimag\"
ObjectFile="vc_mswuddll\dragimag\"
ProgramDataBaseFileName="vc_mswuddll\dragimag.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\dragimag.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\dragimag.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\dragimag\"
ObjectFile="vc_mswunivu\dragimag\"
ProgramDataBaseFileName="vc_mswunivu\dragimag.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\dragimag.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\dragimag.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\dragimag\"
ObjectFile="vc_mswunivud\dragimag\"
ProgramDataBaseFileName="vc_mswunivud\dragimag.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\dragimag.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\dragimag.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\dragimag\"
ObjectFile="vc_mswu\dragimag\"
ProgramDataBaseFileName="vc_mswu\dragimag.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\dragimag.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\dragimag.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\dragimag\"
ObjectFile="vc_mswud\dragimag\"
ProgramDataBaseFileName="vc_mswud\dragimag.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\dragimag.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\dragimag.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\dragimag.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\dragimag.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/dragimag/makefile.bcc b/samples/dragimag/makefile.bcc
index 0812df95da..0882c58b87 100644
--- a/samples/dragimag/makefile.bcc
+++ b/samples/dragimag/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\dragimag.ils del $(OBJS)\dragimag.ils
$(OBJS)\dragimag.exe: $(DRAGIMAG_OBJECTS) $(OBJS)\dragimag_dragimag.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/dragimag/makefile.gcc b/samples/dragimag/makefile.gcc
index 5f8451771a..370911bb3d 100644
--- a/samples/dragimag/makefile.gcc
+++ b/samples/dragimag/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\dragimag.exe del $(OBJS)\dragimag.exe
$(OBJS)\dragimag.exe: $(DRAGIMAG_OBJECTS) $(OBJS)\dragimag_dragimag_rc.o
- $(CXX) -o $@ $(DRAGIMAG_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
data:
if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/dragimag/makefile.unx b/samples/dragimag/makefile.unx
index fdc77efbeb..95b2daf930 100644
--- a/samples/dragimag/makefile.unx
+++ b/samples/dragimag/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild dragimag
-install: all
+install:
uninstall:
diff --git a/samples/dragimag/makefile.vc b/samples/dragimag/makefile.vc
index 59f3d70de8..927a5ef96f 100644
--- a/samples/dragimag/makefile.vc
+++ b/samples/dragimag/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\dragimag.pdb del $(OBJS)\dragimag.pdb
$(OBJS)\dragimag.exe: $(DRAGIMAG_OBJECTS) $(OBJS)\dragimag_dragimag.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\dragimag.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\dragimag.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/dragimag/makefile.wat b/samples/dragimag/makefile.wat
index 72aeb2a1c2..25bd42e4c4 100644
--- a/samples/dragimag/makefile.wat
+++ b/samples/dragimag/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\dragimag.exe : $(DRAGIMAG_OBJECTS) $(OBJS)\dragimag_dragimag.res
@%append $(OBJS)\dragimag.lbc option quiet
@%append $(OBJS)\dragimag.lbc name $^@
@%append $(OBJS)\dragimag.lbc option caseexact
- @%append $(OBJS)\dragimag.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\dragimag.lbc library %i
@%append $(OBJS)\dragimag.lbc option resource=$(OBJS)\dragimag_dragimag.res
diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in
index 9fc8e79e27..4d4d9c1eaa 100644
--- a/samples/drawing/Makefile.in
+++ b/samples/drawing/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ DRAWING_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: drawing$(EXEEXT) $(__drawing_bundle___depname) data
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
drawing$(EXEEXT): $(DRAWING_OBJECTS) $(__drawing___win32rc)
- $(CXX) -o $@ $(DRAWING_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(DRAWING_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)
$(__drawing___mac_setfilecmd)
$(__drawing___os2_emxbindcmd)
@@ -204,6 +204,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean drawing_bundle data
diff --git a/samples/drawing/drawing_vc7.vcproj b/samples/drawing/drawing_vc7.vcproj
index 82c4f9d340..361736a988 100644
--- a/samples/drawing/drawing_vc7.vcproj
+++ b/samples/drawing/drawing_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\drawing"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\drawing\"
ObjectFile="vc_mswunivudll\drawing\"
ProgramDataBaseFileName="vc_mswunivudll\drawing.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\drawing.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\drawing.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\drawing_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\drawing"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\drawing\"
ObjectFile="vc_mswunivuddll\drawing\"
ProgramDataBaseFileName="vc_mswunivuddll\drawing.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\drawing.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\drawing.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\drawing_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\drawing"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\drawing\"
ObjectFile="vc_mswudll\drawing\"
ProgramDataBaseFileName="vc_mswudll\drawing.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\drawing.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\drawing.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\drawing_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\drawing"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\drawing\"
ObjectFile="vc_mswuddll\drawing\"
ProgramDataBaseFileName="vc_mswuddll\drawing.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\drawing.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\drawing.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\drawing_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\drawing"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\drawing\"
ObjectFile="vc_mswunivu\drawing\"
ProgramDataBaseFileName="vc_mswunivu\drawing.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\drawing.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\drawing.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\drawing_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\drawing"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\drawing\"
ObjectFile="vc_mswunivud\drawing\"
ProgramDataBaseFileName="vc_mswunivud\drawing.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\drawing.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\drawing.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\drawing_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\drawing"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\drawing\"
ObjectFile="vc_mswu\drawing\"
ProgramDataBaseFileName="vc_mswu\drawing.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\drawing.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\drawing.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\drawing_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\drawing"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\drawing\"
ObjectFile="vc_mswud\drawing\"
ProgramDataBaseFileName="vc_mswud\drawing.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\drawing.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\drawing.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\drawing_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\drawing.cpp"/>
+ RelativePath=".\drawing.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\drawing.rc"/>
+ RelativePath=".\drawing.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/drawing/drawing_vc8.vcproj b/samples/drawing/drawing_vc8.vcproj
index d64bf409c0..3ee4123c8e 100644
--- a/samples/drawing/drawing_vc8.vcproj
+++ b/samples/drawing/drawing_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\drawing\"
ObjectFile="vc_mswunivudll\drawing\"
ProgramDataBaseFileName="vc_mswunivudll\drawing.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\drawing.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\drawing.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\drawing\"
ObjectFile="vc_mswunivuddll\drawing\"
ProgramDataBaseFileName="vc_mswunivuddll\drawing.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\drawing.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\drawing.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\drawing\"
ObjectFile="vc_mswudll\drawing\"
ProgramDataBaseFileName="vc_mswudll\drawing.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\drawing.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\drawing.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\drawing\"
ObjectFile="vc_mswuddll\drawing\"
ProgramDataBaseFileName="vc_mswuddll\drawing.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\drawing.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\drawing.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\drawing\"
ObjectFile="vc_mswunivu\drawing\"
ProgramDataBaseFileName="vc_mswunivu\drawing.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\drawing.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\drawing.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\drawing\"
ObjectFile="vc_mswunivud\drawing\"
ProgramDataBaseFileName="vc_mswunivud\drawing.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\drawing.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\drawing.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\drawing\"
ObjectFile="vc_mswu\drawing\"
ProgramDataBaseFileName="vc_mswu\drawing.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\drawing.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\drawing.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\drawing\"
ObjectFile="vc_mswud\drawing\"
ProgramDataBaseFileName="vc_mswud\drawing.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\drawing.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\drawing.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\drawing.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\drawing.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/drawing/makefile.bcc b/samples/drawing/makefile.bcc
index 254128c253..22c89eca73 100644
--- a/samples/drawing/makefile.bcc
+++ b/samples/drawing/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\drawing.ils del $(OBJS)\drawing.ils
$(OBJS)\drawing.exe: $(DRAWING_OBJECTS) $(OBJS)\drawing_drawing.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/drawing/makefile.gcc b/samples/drawing/makefile.gcc
index 190af5be73..92335f95ad 100644
--- a/samples/drawing/makefile.gcc
+++ b/samples/drawing/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\drawing.exe del $(OBJS)\drawing.exe
$(OBJS)\drawing.exe: $(DRAWING_OBJECTS) $(OBJS)\drawing_drawing_rc.o
- $(CXX) -o $@ $(DRAWING_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
data:
if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/drawing/makefile.unx b/samples/drawing/makefile.unx
index 021008b781..5db53af096 100644
--- a/samples/drawing/makefile.unx
+++ b/samples/drawing/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild drawing
-install: all
+install:
uninstall:
diff --git a/samples/drawing/makefile.vc b/samples/drawing/makefile.vc
index 20fcde78b6..2e6134158a 100644
--- a/samples/drawing/makefile.vc
+++ b/samples/drawing/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\drawing.pdb del $(OBJS)\drawing.pdb
$(OBJS)\drawing.exe: $(DRAWING_OBJECTS) $(OBJS)\drawing_drawing.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\drawing.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\drawing.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/drawing/makefile.wat b/samples/drawing/makefile.wat
index 5239e86013..ce5b23952c 100644
--- a/samples/drawing/makefile.wat
+++ b/samples/drawing/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\drawing.exe : $(DRAWING_OBJECTS) $(OBJS)\drawing_drawing.res
@%append $(OBJS)\drawing.lbc option quiet
@%append $(OBJS)\drawing.lbc name $^@
@%append $(OBJS)\drawing.lbc option caseexact
- @%append $(OBJS)\drawing.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\drawing.lbc library %i
@%append $(OBJS)\drawing.lbc option resource=$(OBJS)\drawing_drawing.res
diff --git a/samples/editlbox/Makefile.in b/samples/editlbox/Makefile.in
index f68ed3f6cf..479a1cc1a0 100644
--- a/samples/editlbox/Makefile.in
+++ b/samples/editlbox/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -61,7 +61,7 @@ EDITLBOX_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -115,28 +115,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: editlbox$(EXEEXT) $(__editlbox_bundle___depname)
-install: all
+install:
uninstall:
@@ -152,7 +152,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
editlbox$(EXEEXT): $(EDITLBOX_OBJECTS) $(__editlbox___win32rc)
- $(CXX) -o $@ $(EDITLBOX_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
+ $(CXX) -o $@ $(EDITLBOX_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
$(__editlbox___mac_setfilecmd)
$(__editlbox___os2_emxbindcmd)
@@ -197,6 +197,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean editlbox_bundle
diff --git a/samples/editlbox/editlbox_vc7.vcproj b/samples/editlbox/editlbox_vc7.vcproj
index fd3cfe0a5d..5831032634 100644
--- a/samples/editlbox/editlbox_vc7.vcproj
+++ b/samples/editlbox/editlbox_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\editlbox"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\editlbox\"
ObjectFile="vc_mswunivudll\editlbox\"
ProgramDataBaseFileName="vc_mswunivudll\editlbox.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\editlbox.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\editlbox.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\editlbox_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\editlbox"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\editlbox\"
ObjectFile="vc_mswunivuddll\editlbox\"
ProgramDataBaseFileName="vc_mswunivuddll\editlbox.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivuddll\editlbox.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\editlbox.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\editlbox_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\editlbox"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\editlbox\"
ObjectFile="vc_mswudll\editlbox\"
ProgramDataBaseFileName="vc_mswudll\editlbox.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\editlbox.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\editlbox.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\editlbox_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\editlbox"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\editlbox\"
ObjectFile="vc_mswuddll\editlbox\"
ProgramDataBaseFileName="vc_mswuddll\editlbox.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswuddll\editlbox.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\editlbox.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\editlbox_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\editlbox"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\editlbox\"
ObjectFile="vc_mswunivu\editlbox\"
ProgramDataBaseFileName="vc_mswunivu\editlbox.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\editlbox.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\editlbox.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\editlbox_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\editlbox"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\editlbox\"
ObjectFile="vc_mswunivud\editlbox\"
ProgramDataBaseFileName="vc_mswunivud\editlbox.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivud\editlbox.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\editlbox.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\editlbox_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\editlbox"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\editlbox\"
ObjectFile="vc_mswu\editlbox\"
ProgramDataBaseFileName="vc_mswu\editlbox.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\editlbox.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\editlbox.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\editlbox_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\editlbox"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\editlbox\"
ObjectFile="vc_mswud\editlbox\"
ProgramDataBaseFileName="vc_mswud\editlbox.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswud\editlbox.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\editlbox.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\editlbox_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\editlbox.cpp"/>
+ RelativePath=".\editlbox.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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"/>
+ RelativePath=".\..\..\samples\sample.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/editlbox/editlbox_vc8.vcproj b/samples/editlbox/editlbox_vc8.vcproj
index d7eff35099..aa4618d819 100644
--- a/samples/editlbox/editlbox_vc8.vcproj
+++ b/samples/editlbox/editlbox_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\editlbox\"
ObjectFile="vc_mswunivudll\editlbox\"
ProgramDataBaseFileName="vc_mswunivudll\editlbox.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\editlbox.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\editlbox.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\editlbox\"
ObjectFile="vc_mswunivuddll\editlbox\"
ProgramDataBaseFileName="vc_mswunivuddll\editlbox.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivuddll\editlbox.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\editlbox.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\editlbox\"
ObjectFile="vc_mswudll\editlbox\"
ProgramDataBaseFileName="vc_mswudll\editlbox.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\editlbox.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\editlbox.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\editlbox\"
ObjectFile="vc_mswuddll\editlbox\"
ProgramDataBaseFileName="vc_mswuddll\editlbox.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswuddll\editlbox.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\editlbox.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\editlbox\"
ObjectFile="vc_mswunivu\editlbox\"
ProgramDataBaseFileName="vc_mswunivu\editlbox.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\editlbox.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\editlbox.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\editlbox\"
ObjectFile="vc_mswunivud\editlbox\"
ProgramDataBaseFileName="vc_mswunivud\editlbox.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivud\editlbox.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\editlbox.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\editlbox\"
ObjectFile="vc_mswu\editlbox\"
ProgramDataBaseFileName="vc_mswu\editlbox.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\editlbox.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\editlbox.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\editlbox\"
ObjectFile="vc_mswud\editlbox\"
ProgramDataBaseFileName="vc_mswud\editlbox.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswud\editlbox.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\editlbox.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\editlbox.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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>
diff --git a/samples/editlbox/makefile.bcc b/samples/editlbox/makefile.bcc
index 437644ef8c..0491a590e6 100644
--- a/samples/editlbox/makefile.bcc
+++ b/samples/editlbox/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -233,7 +233,7 @@ clean:
-if exist $(OBJS)\editlbox.ils del $(OBJS)\editlbox.ils
$(OBJS)\editlbox.exe: $(EDITLBOX_OBJECTS) $(OBJS)\editlbox_sample.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
c0w32.obj $(EDITLBOX_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)\editlbox_sample.res
|
diff --git a/samples/editlbox/makefile.gcc b/samples/editlbox/makefile.gcc
index ff8b930373..80e16a6654 100644
--- a/samples/editlbox/makefile.gcc
+++ b/samples/editlbox/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -228,7 +228,7 @@ clean:
-if exist $(OBJS)\editlbox.exe del $(OBJS)\editlbox.exe
$(OBJS)\editlbox.exe: $(EDITLBOX_OBJECTS) $(OBJS)\editlbox_sample_rc.o
- $(CXX) -o $@ $(EDITLBOX_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(CXX) -o $@ $(EDITLBOX_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
$(OBJS)\editlbox_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
diff --git a/samples/editlbox/makefile.unx b/samples/editlbox/makefile.unx
index 61aab70e8f..a9d8c34e86 100644
--- a/samples/editlbox/makefile.unx
+++ b/samples/editlbox/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild editlbox
-install: all
+install:
uninstall:
diff --git a/samples/editlbox/makefile.vc b/samples/editlbox/makefile.vc
index 411c0fb069..ce6c50db07 100644
--- a/samples/editlbox/makefile.vc
+++ b/samples/editlbox/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -309,7 +309,7 @@ clean:
-if exist $(OBJS)\editlbox.pdb del $(OBJS)\editlbox.pdb
$(OBJS)\editlbox.exe: $(EDITLBOX_OBJECTS) $(OBJS)\editlbox_sample.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\editlbox.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\editlbox.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(EDITLBOX_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
<<
diff --git a/samples/editlbox/makefile.wat b/samples/editlbox/makefile.wat
index 55b0848f34..398c3f0739 100644
--- a/samples/editlbox/makefile.wat
+++ b/samples/editlbox/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -256,7 +256,7 @@ $(OBJS)\editlbox.exe : $(EDITLBOX_OBJECTS) $(OBJS)\editlbox_sample.res
@%append $(OBJS)\editlbox.lbc option quiet
@%append $(OBJS)\editlbox.lbc name $^@
@%append $(OBJS)\editlbox.lbc option caseexact
- @%append $(OBJS)\editlbox.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%append $(OBJS)\editlbox.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
@for %i in ($(EDITLBOX_OBJECTS)) do @%append $(OBJS)\editlbox.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) do @%append $(OBJS)\editlbox.lbc library %i
@%append $(OBJS)\editlbox.lbc option resource=$(OBJS)\editlbox_sample.res
diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in
index 6b466866ab..a33c36c10d 100644
--- a/samples/erase/Makefile.in
+++ b/samples/erase/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ ERASE_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: erase$(EXEEXT) $(__erase_bundle___depname)
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
erase$(EXEEXT): $(ERASE_OBJECTS) $(__erase___win32rc)
- $(CXX) -o $@ $(ERASE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(ERASE_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)
$(__erase___mac_setfilecmd)
$(__erase___os2_emxbindcmd)
@@ -192,6 +192,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean erase_bundle
diff --git a/samples/erase/erase_vc7.vcproj b/samples/erase/erase_vc7.vcproj
index 0b92fa74fd..5bd0206583 100644
--- a/samples/erase/erase_vc7.vcproj
+++ b/samples/erase/erase_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\erase"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\erase\"
ObjectFile="vc_mswunivudll\erase\"
ProgramDataBaseFileName="vc_mswunivudll\erase.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\erase.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\erase.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\erase_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\erase"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\erase\"
ObjectFile="vc_mswunivuddll\erase\"
ProgramDataBaseFileName="vc_mswunivuddll\erase.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\erase.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\erase.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\erase_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\erase"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\erase\"
ObjectFile="vc_mswudll\erase\"
ProgramDataBaseFileName="vc_mswudll\erase.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\erase.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\erase.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\erase_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\erase"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\erase\"
ObjectFile="vc_mswuddll\erase\"
ProgramDataBaseFileName="vc_mswuddll\erase.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\erase.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\erase.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\erase_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\erase"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\erase\"
ObjectFile="vc_mswunivu\erase\"
ProgramDataBaseFileName="vc_mswunivu\erase.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\erase.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\erase.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\erase_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\erase"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\erase\"
ObjectFile="vc_mswunivud\erase\"
ProgramDataBaseFileName="vc_mswunivud\erase.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\erase.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\erase.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\erase_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\erase"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\erase\"
ObjectFile="vc_mswu\erase\"
ProgramDataBaseFileName="vc_mswu\erase.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\erase.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\erase.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\erase_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\erase"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\erase\"
ObjectFile="vc_mswud\erase\"
ProgramDataBaseFileName="vc_mswud\erase.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\erase.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\erase.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\erase_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\erase.cpp"/>
+ RelativePath=".\erase.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\erase.rc"/>
+ RelativePath=".\erase.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/erase/erase_vc8.vcproj b/samples/erase/erase_vc8.vcproj
index 2b086a0f89..ee1724dda3 100644
--- a/samples/erase/erase_vc8.vcproj
+++ b/samples/erase/erase_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\erase\"
ObjectFile="vc_mswunivudll\erase\"
ProgramDataBaseFileName="vc_mswunivudll\erase.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\erase.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\erase.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\erase\"
ObjectFile="vc_mswunivuddll\erase\"
ProgramDataBaseFileName="vc_mswunivuddll\erase.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\erase.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\erase.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\erase\"
ObjectFile="vc_mswudll\erase\"
ProgramDataBaseFileName="vc_mswudll\erase.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\erase.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\erase.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\erase\"
ObjectFile="vc_mswuddll\erase\"
ProgramDataBaseFileName="vc_mswuddll\erase.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\erase.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\erase.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\erase\"
ObjectFile="vc_mswunivu\erase\"
ProgramDataBaseFileName="vc_mswunivu\erase.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\erase.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\erase.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\erase\"
ObjectFile="vc_mswunivud\erase\"
ProgramDataBaseFileName="vc_mswunivud\erase.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\erase.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\erase.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\erase\"
ObjectFile="vc_mswu\erase\"
ProgramDataBaseFileName="vc_mswu\erase.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\erase.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\erase.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\erase\"
ObjectFile="vc_mswud\erase\"
ProgramDataBaseFileName="vc_mswud\erase.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\erase.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\erase.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\erase.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\erase.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/erase/makefile.bcc b/samples/erase/makefile.bcc
index b3678b5ae6..d733238c13 100644
--- a/samples/erase/makefile.bcc
+++ b/samples/erase/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\erase.ils del $(OBJS)\erase.ils
$(OBJS)\erase.exe: $(ERASE_OBJECTS) $(OBJS)\erase_erase.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/erase/makefile.gcc b/samples/erase/makefile.gcc
index faf53918c7..ca2ec6f8ce 100644
--- a/samples/erase/makefile.gcc
+++ b/samples/erase/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\erase.exe del $(OBJS)\erase.exe
$(OBJS)\erase.exe: $(ERASE_OBJECTS) $(OBJS)\erase_erase_rc.o
- $(CXX) -o $@ $(ERASE_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(OBJS)\erase_erase.o: ./erase.cpp
$(CXX) -c -o $@ $(ERASE_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/erase/makefile.unx b/samples/erase/makefile.unx
index 696ff147cf..fe9b6f6ce4 100644
--- a/samples/erase/makefile.unx
+++ b/samples/erase/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild erase
-install: all
+install:
uninstall:
diff --git a/samples/erase/makefile.vc b/samples/erase/makefile.vc
index bcf3e408fc..d57178e099 100644
--- a/samples/erase/makefile.vc
+++ b/samples/erase/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\erase.pdb del $(OBJS)\erase.pdb
$(OBJS)\erase.exe: $(ERASE_OBJECTS) $(OBJS)\erase_erase.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\erase.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\erase.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/erase/makefile.wat b/samples/erase/makefile.wat
index b1201d5d39..b51bde7df1 100644
--- a/samples/erase/makefile.wat
+++ b/samples/erase/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\erase.exe : $(ERASE_OBJECTS) $(OBJS)\erase_erase.res
@%append $(OBJS)\erase.lbc option quiet
@%append $(OBJS)\erase.lbc name $^@
@%append $(OBJS)\erase.lbc option caseexact
- @%append $(OBJS)\erase.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\erase.lbc library %i
@%append $(OBJS)\erase.lbc option resource=$(OBJS)\erase_erase.res
diff --git a/samples/event/Makefile.in b/samples/event/Makefile.in
index 621c4b56d7..c45c426ecf 100644
--- a/samples/event/Makefile.in
+++ b/samples/event/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ EVENT_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: event$(EXEEXT) $(__event_bundle___depname)
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
event$(EXEEXT): $(EVENT_OBJECTS) $(__event___win32rc)
- $(CXX) -o $@ $(EVENT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(EVENT_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)
$(__event___mac_setfilecmd)
$(__event___os2_emxbindcmd)
@@ -192,6 +192,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean event_bundle
diff --git a/samples/event/event_vc7.vcproj b/samples/event/event_vc7.vcproj
index 4042a91515..bff573fbe4 100644
--- a/samples/event/event_vc7.vcproj
+++ b/samples/event/event_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\event"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\event\"
ObjectFile="vc_mswunivudll\event\"
ProgramDataBaseFileName="vc_mswunivudll\event.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\event.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\event.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\event_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\event"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\event\"
ObjectFile="vc_mswunivuddll\event\"
ProgramDataBaseFileName="vc_mswunivuddll\event.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\event.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\event.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\event_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\event"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\event\"
ObjectFile="vc_mswudll\event\"
ProgramDataBaseFileName="vc_mswudll\event.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\event.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\event.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\event_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\event"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\event\"
ObjectFile="vc_mswuddll\event\"
ProgramDataBaseFileName="vc_mswuddll\event.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\event.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\event.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\event_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\event"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\event\"
ObjectFile="vc_mswunivu\event\"
ProgramDataBaseFileName="vc_mswunivu\event.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\event.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\event.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\event_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\event"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\event\"
ObjectFile="vc_mswunivud\event\"
ProgramDataBaseFileName="vc_mswunivud\event.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\event.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\event.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\event_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\event"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\event\"
ObjectFile="vc_mswu\event\"
ProgramDataBaseFileName="vc_mswu\event.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\event.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\event.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\event_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\event"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\event\"
ObjectFile="vc_mswud\event\"
ProgramDataBaseFileName="vc_mswud\event.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\event.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\event.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\event_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\event.cpp"/>
+ RelativePath=".\event.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\event.rc"/>
+ RelativePath=".\event.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/event/event_vc8.vcproj b/samples/event/event_vc8.vcproj
index b2fc1df0b7..0cef886095 100644
--- a/samples/event/event_vc8.vcproj
+++ b/samples/event/event_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\event\"
ObjectFile="vc_mswunivudll\event\"
ProgramDataBaseFileName="vc_mswunivudll\event.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\event.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\event.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\event\"
ObjectFile="vc_mswunivuddll\event\"
ProgramDataBaseFileName="vc_mswunivuddll\event.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\event.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\event.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\event\"
ObjectFile="vc_mswudll\event\"
ProgramDataBaseFileName="vc_mswudll\event.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\event.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\event.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\event\"
ObjectFile="vc_mswuddll\event\"
ProgramDataBaseFileName="vc_mswuddll\event.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\event.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\event.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\event\"
ObjectFile="vc_mswunivu\event\"
ProgramDataBaseFileName="vc_mswunivu\event.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\event.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\event.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\event\"
ObjectFile="vc_mswunivud\event\"
ProgramDataBaseFileName="vc_mswunivud\event.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\event.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\event.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\event\"
ObjectFile="vc_mswu\event\"
ProgramDataBaseFileName="vc_mswu\event.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\event.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\event.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\event\"
ObjectFile="vc_mswud\event\"
ProgramDataBaseFileName="vc_mswud\event.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\event.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\event.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\event.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\event.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/event/makefile.bcc b/samples/event/makefile.bcc
index 9d0c12880f..649427a81e 100644
--- a/samples/event/makefile.bcc
+++ b/samples/event/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\event.ils del $(OBJS)\event.ils
$(OBJS)\event.exe: $(EVENT_OBJECTS) $(OBJS)\event_event.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/event/makefile.gcc b/samples/event/makefile.gcc
index 3d0fdb34ee..d0990fd184 100644
--- a/samples/event/makefile.gcc
+++ b/samples/event/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\event.exe del $(OBJS)\event.exe
$(OBJS)\event.exe: $(EVENT_OBJECTS) $(OBJS)\event_event_rc.o
- $(CXX) -o $@ $(EVENT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(OBJS)\event_event.o: ./event.cpp
$(CXX) -c -o $@ $(EVENT_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/event/makefile.unx b/samples/event/makefile.unx
index 7218529b6f..f88d006093 100644
--- a/samples/event/makefile.unx
+++ b/samples/event/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild event
-install: all
+install:
uninstall:
diff --git a/samples/event/makefile.vc b/samples/event/makefile.vc
index 03957c92a4..3288ce548e 100644
--- a/samples/event/makefile.vc
+++ b/samples/event/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\event.pdb del $(OBJS)\event.pdb
$(OBJS)\event.exe: $(EVENT_OBJECTS) $(OBJS)\event_event.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\event.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\event.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/event/makefile.wat b/samples/event/makefile.wat
index f09c2223fd..c01ee4d2fd 100644
--- a/samples/event/makefile.wat
+++ b/samples/event/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\event.exe : $(EVENT_OBJECTS) $(OBJS)\event_event.res
@%append $(OBJS)\event.lbc option quiet
@%append $(OBJS)\event.lbc name $^@
@%append $(OBJS)\event.lbc option caseexact
- @%append $(OBJS)\event.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\event.lbc library %i
@%append $(OBJS)\event.lbc option resource=$(OBJS)\event_event.res
diff --git a/samples/except/Makefile.in b/samples/except/Makefile.in
index 7a081e0037..1e3f486145 100644
--- a/samples/except/Makefile.in
+++ b/samples/except/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ EXCEPT_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: except$(EXEEXT) $(__except_bundle___depname)
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
except$(EXEEXT): $(EXCEPT_OBJECTS) $(__except___win32rc)
- $(CXX) -o $@ $(EXCEPT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(EXCEPT_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)
$(__except___mac_setfilecmd)
$(__except___os2_emxbindcmd)
@@ -192,6 +192,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean except_bundle
diff --git a/samples/except/except_vc7.vcproj b/samples/except/except_vc7.vcproj
index ba64106b77..09d503e0fd 100644
--- a/samples/except/except_vc7.vcproj
+++ b/samples/except/except_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\except"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\except\"
ObjectFile="vc_mswunivudll\except\"
ProgramDataBaseFileName="vc_mswunivudll\except.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\except.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\except.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\except_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\except"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\except\"
ObjectFile="vc_mswunivuddll\except\"
ProgramDataBaseFileName="vc_mswunivuddll\except.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\except.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\except.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\except_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\except"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\except\"
ObjectFile="vc_mswudll\except\"
ProgramDataBaseFileName="vc_mswudll\except.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\except.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\except.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\except_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\except"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\except\"
ObjectFile="vc_mswuddll\except\"
ProgramDataBaseFileName="vc_mswuddll\except.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\except.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\except.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\except_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\except"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\except\"
ObjectFile="vc_mswunivu\except\"
ProgramDataBaseFileName="vc_mswunivu\except.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\except.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\except.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\except_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\except"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\except\"
ObjectFile="vc_mswunivud\except\"
ProgramDataBaseFileName="vc_mswunivud\except.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\except.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\except.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\except_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\except"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\except\"
ObjectFile="vc_mswu\except\"
ProgramDataBaseFileName="vc_mswu\except.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\except.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\except.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\except_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\except"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\except\"
ObjectFile="vc_mswud\except\"
ProgramDataBaseFileName="vc_mswud\except.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\except.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\except.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\except_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\except.cpp"/>
+ RelativePath=".\except.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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"/>
+ RelativePath=".\..\..\samples\sample.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/except/except_vc8.vcproj b/samples/except/except_vc8.vcproj
index 051af743bd..8e1d6119e9 100644
--- a/samples/except/except_vc8.vcproj
+++ b/samples/except/except_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\except\"
ObjectFile="vc_mswunivudll\except\"
ProgramDataBaseFileName="vc_mswunivudll\except.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\except.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\except.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\except\"
ObjectFile="vc_mswunivuddll\except\"
ProgramDataBaseFileName="vc_mswunivuddll\except.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\except.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\except.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\except\"
ObjectFile="vc_mswudll\except\"
ProgramDataBaseFileName="vc_mswudll\except.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\except.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\except.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\except\"
ObjectFile="vc_mswuddll\except\"
ProgramDataBaseFileName="vc_mswuddll\except.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\except.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\except.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\except\"
ObjectFile="vc_mswunivu\except\"
ProgramDataBaseFileName="vc_mswunivu\except.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\except.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\except.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\except\"
ObjectFile="vc_mswunivud\except\"
ProgramDataBaseFileName="vc_mswunivud\except.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\except.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\except.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\except\"
ObjectFile="vc_mswu\except\"
ProgramDataBaseFileName="vc_mswu\except.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\except.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\except.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\except\"
ObjectFile="vc_mswud\except\"
ProgramDataBaseFileName="vc_mswud\except.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\except.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\except.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\except.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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>
diff --git a/samples/except/makefile.bcc b/samples/except/makefile.bcc
index 492097a5f5..596f0109c9 100644
--- a/samples/except/makefile.bcc
+++ b/samples/except/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\except.ils del $(OBJS)\except.ils
$(OBJS)\except.exe: $(EXCEPT_OBJECTS) $(OBJS)\except_sample.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/except/makefile.gcc b/samples/except/makefile.gcc
index 9fb2a82f78..dc43a7a8dc 100644
--- a/samples/except/makefile.gcc
+++ b/samples/except/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\except.exe del $(OBJS)\except.exe
$(OBJS)\except.exe: $(EXCEPT_OBJECTS) $(OBJS)\except_sample_rc.o
- $(CXX) -o $@ $(EXCEPT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(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
diff --git a/samples/except/makefile.unx b/samples/except/makefile.unx
index 923c2d17cd..0571d8dfe7 100644
--- a/samples/except/makefile.unx
+++ b/samples/except/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild except
-install: all
+install:
uninstall:
diff --git a/samples/except/makefile.vc b/samples/except/makefile.vc
index 4e9074b9bb..a327f560f7 100644
--- a/samples/except/makefile.vc
+++ b/samples/except/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\except.pdb del $(OBJS)\except.pdb
$(OBJS)\except.exe: $(EXCEPT_OBJECTS) $(OBJS)\except_sample.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\except.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\except.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/except/makefile.wat b/samples/except/makefile.wat
index 84113b5027..0ee25f7923 100644
--- a/samples/except/makefile.wat
+++ b/samples/except/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\except.exe : $(EXCEPT_OBJECTS) $(OBJS)\except_sample.res
@%append $(OBJS)\except.lbc option quiet
@%append $(OBJS)\except.lbc name $^@
@%append $(OBJS)\except.lbc option caseexact
- @%append $(OBJS)\except.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\except.lbc library %i
@%append $(OBJS)\except.lbc option resource=$(OBJS)\except_sample.res
diff --git a/samples/exec/Makefile.in b/samples/exec/Makefile.in
index 12b5c80d1e..83a7ffc969 100644
--- a/samples/exec/Makefile.in
+++ b/samples/exec/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ EXEC_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: exec$(EXEEXT) $(__exec_bundle___depname)
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
exec$(EXEEXT): $(EXEC_OBJECTS) $(__exec___win32rc)
- $(CXX) -o $@ $(EXEC_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(EXEC_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)
$(__exec___mac_setfilecmd)
$(__exec___os2_emxbindcmd)
@@ -192,6 +192,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean exec_bundle
diff --git a/samples/exec/exec_vc7.vcproj b/samples/exec/exec_vc7.vcproj
index e2ea3110f1..f13cdd3cac 100644
--- a/samples/exec/exec_vc7.vcproj
+++ b/samples/exec/exec_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\exec"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\exec\"
ObjectFile="vc_mswunivudll\exec\"
ProgramDataBaseFileName="vc_mswunivudll\exec.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\exec.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\exec.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\exec_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\exec"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\exec\"
ObjectFile="vc_mswunivuddll\exec\"
ProgramDataBaseFileName="vc_mswunivuddll\exec.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\exec.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\exec.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\exec_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\exec"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\exec\"
ObjectFile="vc_mswudll\exec\"
ProgramDataBaseFileName="vc_mswudll\exec.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\exec.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\exec.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\exec_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\exec"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\exec\"
ObjectFile="vc_mswuddll\exec\"
ProgramDataBaseFileName="vc_mswuddll\exec.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\exec.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\exec.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\exec_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\exec"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\exec\"
ObjectFile="vc_mswunivu\exec\"
ProgramDataBaseFileName="vc_mswunivu\exec.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\exec.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\exec.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\exec_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\exec"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\exec\"
ObjectFile="vc_mswunivud\exec\"
ProgramDataBaseFileName="vc_mswunivud\exec.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\exec.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\exec.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\exec_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\exec"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\exec\"
ObjectFile="vc_mswu\exec\"
ProgramDataBaseFileName="vc_mswu\exec.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\exec.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\exec.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\exec_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\exec"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\exec\"
ObjectFile="vc_mswud\exec\"
ProgramDataBaseFileName="vc_mswud\exec.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\exec.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\exec.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\exec_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\exec.cpp"/>
+ RelativePath=".\exec.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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"/>
+ RelativePath=".\..\..\samples\sample.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/exec/exec_vc8.vcproj b/samples/exec/exec_vc8.vcproj
index 37c569b1d6..ad18f390b7 100644
--- a/samples/exec/exec_vc8.vcproj
+++ b/samples/exec/exec_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\exec\"
ObjectFile="vc_mswunivudll\exec\"
ProgramDataBaseFileName="vc_mswunivudll\exec.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\exec.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\exec.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\exec\"
ObjectFile="vc_mswunivuddll\exec\"
ProgramDataBaseFileName="vc_mswunivuddll\exec.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\exec.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\exec.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\exec\"
ObjectFile="vc_mswudll\exec\"
ProgramDataBaseFileName="vc_mswudll\exec.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\exec.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\exec.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\exec\"
ObjectFile="vc_mswuddll\exec\"
ProgramDataBaseFileName="vc_mswuddll\exec.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\exec.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\exec.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\exec\"
ObjectFile="vc_mswunivu\exec\"
ProgramDataBaseFileName="vc_mswunivu\exec.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\exec.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\exec.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\exec\"
ObjectFile="vc_mswunivud\exec\"
ProgramDataBaseFileName="vc_mswunivud\exec.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\exec.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\exec.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\exec\"
ObjectFile="vc_mswu\exec\"
ProgramDataBaseFileName="vc_mswu\exec.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\exec.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\exec.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\exec\"
ObjectFile="vc_mswud\exec\"
ProgramDataBaseFileName="vc_mswud\exec.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\exec.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\exec.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\exec.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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>
diff --git a/samples/exec/makefile.bcc b/samples/exec/makefile.bcc
index 023680edfd..bd8badf9a6 100644
--- a/samples/exec/makefile.bcc
+++ b/samples/exec/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\exec.ils del $(OBJS)\exec.ils
$(OBJS)\exec.exe: $(EXEC_OBJECTS) $(OBJS)\exec_sample.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/exec/makefile.gcc b/samples/exec/makefile.gcc
index 343418a842..54f93720ad 100644
--- a/samples/exec/makefile.gcc
+++ b/samples/exec/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\exec.exe del $(OBJS)\exec.exe
$(OBJS)\exec.exe: $(EXEC_OBJECTS) $(OBJS)\exec_sample_rc.o
- $(CXX) -o $@ $(EXEC_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(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
diff --git a/samples/exec/makefile.unx b/samples/exec/makefile.unx
index d49c8e6328..df4fa63598 100644
--- a/samples/exec/makefile.unx
+++ b/samples/exec/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild exec
-install: all
+install:
uninstall:
diff --git a/samples/exec/makefile.vc b/samples/exec/makefile.vc
index 91a589a1bb..6572a11f8a 100644
--- a/samples/exec/makefile.vc
+++ b/samples/exec/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\exec.pdb del $(OBJS)\exec.pdb
$(OBJS)\exec.exe: $(EXEC_OBJECTS) $(OBJS)\exec_sample.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\exec.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\exec.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/exec/makefile.wat b/samples/exec/makefile.wat
index 71670dee13..032a3d433e 100644
--- a/samples/exec/makefile.wat
+++ b/samples/exec/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\exec.exe : $(EXEC_OBJECTS) $(OBJS)\exec_sample.res
@%append $(OBJS)\exec.lbc option quiet
@%append $(OBJS)\exec.lbc name $^@
@%append $(OBJS)\exec.lbc option caseexact
- @%append $(OBJS)\exec.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\exec.lbc library %i
@%append $(OBJS)\exec.lbc option resource=$(OBJS)\exec_sample.res
diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in
index b62a851f95..afc4f608ad 100644
--- a/samples/font/Makefile.in
+++ b/samples/font/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ FONT_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: font$(EXEEXT) $(__font_bundle___depname)
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
font$(EXEEXT): $(FONT_OBJECTS) $(__font___win32rc)
- $(CXX) -o $@ $(FONT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(FONT_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)
$(__font___mac_setfilecmd)
$(__font___os2_emxbindcmd)
@@ -192,6 +192,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean font_bundle
diff --git a/samples/font/font_vc7.vcproj b/samples/font/font_vc7.vcproj
index 614656cd20..1846967e3e 100644
--- a/samples/font/font_vc7.vcproj
+++ b/samples/font/font_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\font"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\font\"
ObjectFile="vc_mswunivudll\font\"
ProgramDataBaseFileName="vc_mswunivudll\font.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\font.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\font.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\font_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\font"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\font\"
ObjectFile="vc_mswunivuddll\font\"
ProgramDataBaseFileName="vc_mswunivuddll\font.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\font.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\font.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\font_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\font"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\font\"
ObjectFile="vc_mswudll\font\"
ProgramDataBaseFileName="vc_mswudll\font.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\font.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\font.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\font_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\font"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\font\"
ObjectFile="vc_mswuddll\font\"
ProgramDataBaseFileName="vc_mswuddll\font.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\font.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\font.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\font_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\font"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\font\"
ObjectFile="vc_mswunivu\font\"
ProgramDataBaseFileName="vc_mswunivu\font.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\font.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\font.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\font_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\font"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\font\"
ObjectFile="vc_mswunivud\font\"
ProgramDataBaseFileName="vc_mswunivud\font.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\font.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\font.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\font_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\font"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\font\"
ObjectFile="vc_mswu\font\"
ProgramDataBaseFileName="vc_mswu\font.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\font.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\font.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\font_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\font"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\font\"
ObjectFile="vc_mswud\font\"
ProgramDataBaseFileName="vc_mswud\font.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\font.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\font.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\font_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\font.cpp"/>
+ RelativePath=".\font.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\font.rc"/>
+ RelativePath=".\font.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/font/font_vc8.vcproj b/samples/font/font_vc8.vcproj
index 1cdd76e2fe..29da33e2b4 100644
--- a/samples/font/font_vc8.vcproj
+++ b/samples/font/font_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\font\"
ObjectFile="vc_mswunivudll\font\"
ProgramDataBaseFileName="vc_mswunivudll\font.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\font.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\font.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\font\"
ObjectFile="vc_mswunivuddll\font\"
ProgramDataBaseFileName="vc_mswunivuddll\font.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\font.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\font.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\font\"
ObjectFile="vc_mswudll\font\"
ProgramDataBaseFileName="vc_mswudll\font.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\font.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\font.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\font\"
ObjectFile="vc_mswuddll\font\"
ProgramDataBaseFileName="vc_mswuddll\font.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\font.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\font.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\font\"
ObjectFile="vc_mswunivu\font\"
ProgramDataBaseFileName="vc_mswunivu\font.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\font.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\font.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\font\"
ObjectFile="vc_mswunivud\font\"
ProgramDataBaseFileName="vc_mswunivud\font.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\font.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\font.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\font\"
ObjectFile="vc_mswu\font\"
ProgramDataBaseFileName="vc_mswu\font.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\font.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\font.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\font\"
ObjectFile="vc_mswud\font\"
ProgramDataBaseFileName="vc_mswud\font.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\font.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\font.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\font.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\font.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/font/makefile.bcc b/samples/font/makefile.bcc
index f5a95f2657..649e492c43 100644
--- a/samples/font/makefile.bcc
+++ b/samples/font/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\font.ils del $(OBJS)\font.ils
$(OBJS)\font.exe: $(FONT_OBJECTS) $(OBJS)\font_font.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/font/makefile.gcc b/samples/font/makefile.gcc
index 36f23f6d08..8339ed9000 100644
--- a/samples/font/makefile.gcc
+++ b/samples/font/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\font.exe del $(OBJS)\font.exe
$(OBJS)\font.exe: $(FONT_OBJECTS) $(OBJS)\font_font_rc.o
- $(CXX) -o $@ $(FONT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(OBJS)\font_font.o: ./font.cpp
$(CXX) -c -o $@ $(FONT_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/font/makefile.unx b/samples/font/makefile.unx
index 098d8567c6..128e6dfb42 100644
--- a/samples/font/makefile.unx
+++ b/samples/font/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild font
-install: all
+install:
uninstall:
diff --git a/samples/font/makefile.vc b/samples/font/makefile.vc
index 0f3d23da04..d1f1703c46 100644
--- a/samples/font/makefile.vc
+++ b/samples/font/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\font.pdb del $(OBJS)\font.pdb
$(OBJS)\font.exe: $(FONT_OBJECTS) $(OBJS)\font_font.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\font.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\font.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/font/makefile.wat b/samples/font/makefile.wat
index 513a041165..d1c29f4131 100644
--- a/samples/font/makefile.wat
+++ b/samples/font/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\font.exe : $(FONT_OBJECTS) $(OBJS)\font_font.res
@%append $(OBJS)\font.lbc option quiet
@%append $(OBJS)\font.lbc name $^@
@%append $(OBJS)\font.lbc option caseexact
- @%append $(OBJS)\font.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\font.lbc library %i
@%append $(OBJS)\font.lbc option resource=$(OBJS)\font_font.res
diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in
index 116b10de21..eb15adf2ce 100644
--- a/samples/grid/Makefile.in
+++ b/samples/grid/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -63,7 +63,7 @@ GRID_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -123,28 +123,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: grid$(EXEEXT) $(__grid_bundle___depname)
-install: all
+install:
uninstall:
@@ -160,7 +160,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
grid$(EXEEXT): $(GRID_OBJECTS) $(__grid___win32rc)
- $(CXX) -o $@ $(GRID_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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)
+ $(CXX) -o $@ $(GRID_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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)
$(__grid___mac_setfilecmd)
$(__grid___os2_emxbindcmd)
@@ -205,6 +205,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean grid_bundle
diff --git a/samples/grid/grid_vc7.vcproj b/samples/grid/grid_vc7.vcproj
index af5715ccd7..8b20f915ed 100644
--- a/samples/grid/grid_vc7.vcproj
+++ b/samples/grid/grid_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\grid"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\grid\"
ObjectFile="vc_mswunivudll\grid\"
ProgramDataBaseFileName="vc_mswunivudll\grid.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_adv.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29u_adv.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"
OutputFile="vc_mswunivudll\grid.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\grid.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\grid_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\grid"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\grid\"
ObjectFile="vc_mswunivuddll\grid\"
ProgramDataBaseFileName="vc_mswunivuddll\grid.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxbase29ud_xml.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxbase29ud_xml.lib 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"
OutputFile="vc_mswunivuddll\grid.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\grid.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\grid_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\grid"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\grid\"
ObjectFile="vc_mswudll\grid\"
ProgramDataBaseFileName="vc_mswudll\grid.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_adv.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29u_adv.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"
OutputFile="vc_mswudll\grid.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\grid.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\grid_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\grid"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\grid\"
ObjectFile="vc_mswuddll\grid\"
ProgramDataBaseFileName="vc_mswuddll\grid.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib wxmsw29ud_html.lib wxbase29ud_xml.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib wxmsw29ud_html.lib wxbase29ud_xml.lib 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"
OutputFile="vc_mswuddll\grid.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\grid.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\grid_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\grid"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\grid\"
ObjectFile="vc_mswunivu\grid\"
ProgramDataBaseFileName="vc_mswunivu\grid.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_adv.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29u_adv.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"
OutputFile="vc_mswunivu\grid.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\grid.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\grid_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\grid"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\grid\"
ObjectFile="vc_mswunivud\grid\"
ProgramDataBaseFileName="vc_mswunivud\grid.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxbase29ud_xml.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxbase29ud_xml.lib 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"
OutputFile="vc_mswunivud\grid.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\grid.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\grid_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\grid"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\grid\"
ObjectFile="vc_mswu\grid\"
ProgramDataBaseFileName="vc_mswu\grid.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_adv.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29u_adv.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"
OutputFile="vc_mswu\grid.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\grid.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\grid_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\grid"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\grid\"
ObjectFile="vc_mswud\grid\"
ProgramDataBaseFileName="vc_mswud\grid.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib wxmsw29ud_html.lib wxbase29ud_xml.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib wxmsw29ud_html.lib wxbase29ud_xml.lib 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"
OutputFile="vc_mswud\grid.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\grid.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\grid_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\griddemo.cpp"/>
+ RelativePath=".\griddemo.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\griddemo.rc"/>
+ RelativePath=".\griddemo.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/grid/grid_vc8.vcproj b/samples/grid/grid_vc8.vcproj
index 82cfbf3bfc..40d54782e2 100644
--- a/samples/grid/grid_vc8.vcproj
+++ b/samples/grid/grid_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\grid\"
ObjectFile="vc_mswunivudll\grid\"
ProgramDataBaseFileName="vc_mswunivudll\grid.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_adv.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29u_adv.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"
OutputFile="vc_mswunivudll\grid.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\grid.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\grid\"
ObjectFile="vc_mswunivuddll\grid\"
ProgramDataBaseFileName="vc_mswunivuddll\grid.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxbase29ud_xml.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxbase29ud_xml.lib 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"
OutputFile="vc_mswunivuddll\grid.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\grid.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\grid\"
ObjectFile="vc_mswudll\grid\"
ProgramDataBaseFileName="vc_mswudll\grid.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_adv.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29u_adv.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"
OutputFile="vc_mswudll\grid.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\grid.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\grid\"
ObjectFile="vc_mswuddll\grid\"
ProgramDataBaseFileName="vc_mswuddll\grid.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib wxmsw29ud_html.lib wxbase29ud_xml.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib wxmsw29ud_html.lib wxbase29ud_xml.lib 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"
OutputFile="vc_mswuddll\grid.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\grid.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\grid\"
ObjectFile="vc_mswunivu\grid\"
ProgramDataBaseFileName="vc_mswunivu\grid.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_adv.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29u_adv.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"
OutputFile="vc_mswunivu\grid.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\grid.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\grid\"
ObjectFile="vc_mswunivud\grid\"
ProgramDataBaseFileName="vc_mswunivud\grid.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxbase29ud_xml.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxbase29ud_xml.lib 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"
OutputFile="vc_mswunivud\grid.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\grid.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\grid\"
ObjectFile="vc_mswu\grid\"
ProgramDataBaseFileName="vc_mswu\grid.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_adv.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29u_adv.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"
OutputFile="vc_mswu\grid.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\grid.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\grid\"
ObjectFile="vc_mswud\grid\"
ProgramDataBaseFileName="vc_mswud\grid.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib wxmsw29ud_html.lib wxbase29ud_xml.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib wxmsw29ud_html.lib wxbase29ud_xml.lib 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"
OutputFile="vc_mswud\grid.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\grid.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\griddemo.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\griddemo.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/grid/makefile.bcc b/samples/grid/makefile.bcc
index febbff7134..f9d94ed251 100644
--- a/samples/grid/makefile.bcc
+++ b/samples/grid/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -241,7 +241,7 @@ clean:
-if exist $(OBJS)\grid.ils del $(OBJS)\grid.ils
$(OBJS)\grid.exe: $(GRID_OBJECTS) $(OBJS)\grid_griddemo.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
c0w32.obj $(GRID_OBJECTS),$@,, $(__WXLIB_ADV_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)\grid_griddemo.res
|
diff --git a/samples/grid/makefile.gcc b/samples/grid/makefile.gcc
index 3aa2c5fd49..a30604d6f1 100644
--- a/samples/grid/makefile.gcc
+++ b/samples/grid/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -236,7 +236,7 @@ clean:
-if exist $(OBJS)\grid.exe del $(OBJS)\grid.exe
$(OBJS)\grid.exe: $(GRID_OBJECTS) $(OBJS)\grid_griddemo_rc.o
- $(CXX) -o $@ $(GRID_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_ADV_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
+ $(CXX) -o $@ $(GRID_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_ADV_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
$(OBJS)\grid_griddemo.o: ./griddemo.cpp
$(CXX) -c -o $@ $(GRID_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/grid/makefile.unx b/samples/grid/makefile.unx
index de4e7f0a29..33a5930c4a 100644
--- a/samples/grid/makefile.unx
+++ b/samples/grid/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild grid
-install: all
+install:
uninstall:
diff --git a/samples/grid/makefile.vc b/samples/grid/makefile.vc
index c70c0b0ec5..2fc10a0748 100644
--- a/samples/grid/makefile.vc
+++ b/samples/grid/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -317,7 +317,7 @@ clean:
-if exist $(OBJS)\grid.pdb del $(OBJS)\grid.pdb
$(OBJS)\grid.exe: $(GRID_OBJECTS) $(OBJS)\grid_griddemo.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\grid.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\grid.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(GRID_OBJECTS) $(__WXLIB_ADV_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
<<
diff --git a/samples/grid/makefile.wat b/samples/grid/makefile.wat
index e5e16c85c9..5bf17ed669 100644
--- a/samples/grid/makefile.wat
+++ b/samples/grid/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -266,7 +266,7 @@ $(OBJS)\grid.exe : $(GRID_OBJECTS) $(OBJS)\grid_griddemo.res
@%append $(OBJS)\grid.lbc option quiet
@%append $(OBJS)\grid.lbc name $^@
@%append $(OBJS)\grid.lbc option caseexact
- @%append $(OBJS)\grid.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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_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) do @%append $(OBJS)\grid.lbc library %i
@%append $(OBJS)\grid.lbc option resource=$(OBJS)\grid_griddemo.res
diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in
index 9a129b07ed..b8ff3647e8 100644
--- a/samples/help/Makefile.in
+++ b/samples/help/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -62,7 +62,7 @@ HELP_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -119,28 +119,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: help$(EXEEXT) $(__help_bundle___depname) data data_doc
-install: all
+install:
uninstall:
@@ -156,7 +156,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
help$(EXEEXT): $(HELP_OBJECTS) $(__help___win32rc)
- $(CXX) -o $@ $(HELP_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
+ $(CXX) -o $@ $(HELP_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
$(__help___mac_setfilecmd)
$(__help___os2_emxbindcmd)
@@ -225,6 +225,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean help_bundle data data_doc
diff --git a/samples/help/help_vc7.vcproj b/samples/help/help_vc7.vcproj
index 59d09d301e..127cb25cc6 100644
--- a/samples/help/help_vc7.vcproj
+++ b/samples/help/help_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\help"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\help\"
ObjectFile="vc_mswunivudll\help\"
ProgramDataBaseFileName="vc_mswunivudll\help.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\help.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\help.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\help_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\help"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\help\"
ObjectFile="vc_mswunivuddll\help\"
ProgramDataBaseFileName="vc_mswunivuddll\help.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivuddll\help.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\help.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\help_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\help"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\help\"
ObjectFile="vc_mswudll\help\"
ProgramDataBaseFileName="vc_mswudll\help.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\help.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\help.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\help_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\help"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\help\"
ObjectFile="vc_mswuddll\help\"
ProgramDataBaseFileName="vc_mswuddll\help.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib wxmsw29ud_adv.lib 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"
OutputFile="vc_mswuddll\help.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\help.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\help_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\help"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\help\"
ObjectFile="vc_mswunivu\help\"
ProgramDataBaseFileName="vc_mswunivu\help.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\help.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\help.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\help_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\help"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\help\"
ObjectFile="vc_mswunivud\help\"
ProgramDataBaseFileName="vc_mswunivud\help.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivud\help.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\help.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\help_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\help"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\help\"
ObjectFile="vc_mswu\help\"
ProgramDataBaseFileName="vc_mswu\help.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\help.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\help.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\help_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\help"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\help\"
ObjectFile="vc_mswud\help\"
ProgramDataBaseFileName="vc_mswud\help.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib wxmsw29ud_adv.lib 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"
OutputFile="vc_mswud\help.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\help.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\help_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\demo.cpp"/>
+ RelativePath=".\demo.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\demo.rc"/>
+ RelativePath=".\demo.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/help/help_vc8.vcproj b/samples/help/help_vc8.vcproj
index 373fc3dc3c..e575a759a0 100644
--- a/samples/help/help_vc8.vcproj
+++ b/samples/help/help_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\help\"
ObjectFile="vc_mswunivudll\help\"
ProgramDataBaseFileName="vc_mswunivudll\help.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\help.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\help.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\help\"
ObjectFile="vc_mswunivuddll\help\"
ProgramDataBaseFileName="vc_mswunivuddll\help.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivuddll\help.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\help.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\help\"
ObjectFile="vc_mswudll\help\"
ProgramDataBaseFileName="vc_mswudll\help.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\help.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\help.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\help\"
ObjectFile="vc_mswuddll\help\"
ProgramDataBaseFileName="vc_mswuddll\help.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib wxmsw29ud_adv.lib 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"
OutputFile="vc_mswuddll\help.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\help.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\help\"
ObjectFile="vc_mswunivu\help\"
ProgramDataBaseFileName="vc_mswunivu\help.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\help.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\help.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\help\"
ObjectFile="vc_mswunivud\help\"
ProgramDataBaseFileName="vc_mswunivud\help.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivud\help.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\help.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\help\"
ObjectFile="vc_mswu\help\"
ProgramDataBaseFileName="vc_mswu\help.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\help.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\help.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\help\"
ObjectFile="vc_mswud\help\"
ProgramDataBaseFileName="vc_mswud\help.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib wxmsw29ud_adv.lib 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"
OutputFile="vc_mswud\help.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\help.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\demo.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\demo.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/help/makefile.bcc b/samples/help/makefile.bcc
index 27ad746032..a3931584c8 100644
--- a/samples/help/makefile.bcc
+++ b/samples/help/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -237,7 +237,7 @@ clean:
-if exist $(OBJS)\help.ils del $(OBJS)\help.ils
$(OBJS)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_demo.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/help/makefile.gcc b/samples/help/makefile.gcc
index 471cb21480..fded651ba0 100644
--- a/samples/help/makefile.gcc
+++ b/samples/help/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -232,7 +232,7 @@ clean:
-if exist $(OBJS)\help.exe del $(OBJS)\help.exe
$(OBJS)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_demo_rc.o
- $(CXX) -o $@ $(HELP_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
data:
if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/help/makefile.unx b/samples/help/makefile.unx
index eec47f55aa..3307cc49a4 100644
--- a/samples/help/makefile.unx
+++ b/samples/help/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild help
-install: all
+install:
uninstall:
diff --git a/samples/help/makefile.vc b/samples/help/makefile.vc
index 02c890526b..caa4653a66 100644
--- a/samples/help/makefile.vc
+++ b/samples/help/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -313,7 +313,7 @@ clean:
-if exist $(OBJS)\help.pdb del $(OBJS)\help.pdb
$(OBJS)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_demo.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\help.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\help.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/help/makefile.wat b/samples/help/makefile.wat
index 5a4efd19a5..39f077fa95 100644
--- a/samples/help/makefile.wat
+++ b/samples/help/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -261,7 +261,7 @@ $(OBJS)\help.exe : $(HELP_OBJECTS) $(OBJS)\help_demo.res
@%append $(OBJS)\help.lbc option quiet
@%append $(OBJS)\help.lbc name $^@
@%append $(OBJS)\help.lbc option caseexact
- @%append $(OBJS)\help.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\help.lbc library %i
@%append $(OBJS)\help.lbc option resource=$(OBJS)\help_demo.res
diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in
index 197c294426..701611a873 100644
--- a/samples/htlbox/Makefile.in
+++ b/samples/htlbox/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -60,7 +60,7 @@ HTLBOX_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -114,28 +114,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: htlbox$(EXEEXT) $(__htlbox_bundle___depname)
-install: all
+install:
uninstall:
@@ -151,7 +151,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
htlbox$(EXEEXT): $(HTLBOX_OBJECTS) $(__htlbox___win32rc)
- $(CXX) -o $@ $(HTLBOX_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
+ $(CXX) -o $@ $(HTLBOX_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
$(__htlbox___mac_setfilecmd)
$(__htlbox___os2_emxbindcmd)
@@ -196,6 +196,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean htlbox_bundle
diff --git a/samples/htlbox/htlbox_vc7.vcproj b/samples/htlbox/htlbox_vc7.vcproj
index 17b82aa0ce..a529a2c9d3 100644
--- a/samples/htlbox/htlbox_vc7.vcproj
+++ b/samples/htlbox/htlbox_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\htlbox"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\htlbox\"
ObjectFile="vc_mswunivudll\htlbox\"
ProgramDataBaseFileName="vc_mswunivudll\htlbox.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\htlbox.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\htlbox.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\htlbox_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\htlbox"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\htlbox\"
ObjectFile="vc_mswunivuddll\htlbox\"
ProgramDataBaseFileName="vc_mswunivuddll\htlbox.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib 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"
OutputFile="vc_mswunivuddll\htlbox.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\htlbox.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\htlbox_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\htlbox"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\htlbox\"
ObjectFile="vc_mswudll\htlbox\"
ProgramDataBaseFileName="vc_mswudll\htlbox.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\htlbox.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\htlbox.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\htlbox_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\htlbox"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\htlbox\"
ObjectFile="vc_mswuddll\htlbox\"
ProgramDataBaseFileName="vc_mswuddll\htlbox.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib 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"
OutputFile="vc_mswuddll\htlbox.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\htlbox.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\htlbox_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\htlbox"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\htlbox\"
ObjectFile="vc_mswunivu\htlbox\"
ProgramDataBaseFileName="vc_mswunivu\htlbox.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\htlbox.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\htlbox.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\htlbox_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\htlbox"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\htlbox\"
ObjectFile="vc_mswunivud\htlbox\"
ProgramDataBaseFileName="vc_mswunivud\htlbox.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib 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"
OutputFile="vc_mswunivud\htlbox.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\htlbox.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\htlbox_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\htlbox"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\htlbox\"
ObjectFile="vc_mswu\htlbox\"
ProgramDataBaseFileName="vc_mswu\htlbox.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\htlbox.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\htlbox.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\htlbox_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\htlbox"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\htlbox\"
ObjectFile="vc_mswud\htlbox\"
ProgramDataBaseFileName="vc_mswud\htlbox.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib 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"
OutputFile="vc_mswud\htlbox.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\htlbox.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\htlbox_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\htlbox.cpp"/>
+ RelativePath=".\htlbox.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\htlbox.rc"/>
+ RelativePath=".\htlbox.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/htlbox/htlbox_vc8.vcproj b/samples/htlbox/htlbox_vc8.vcproj
index 981a888337..1608e366c1 100644
--- a/samples/htlbox/htlbox_vc8.vcproj
+++ b/samples/htlbox/htlbox_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\htlbox\"
ObjectFile="vc_mswunivudll\htlbox\"
ProgramDataBaseFileName="vc_mswunivudll\htlbox.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\htlbox.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\htlbox.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\htlbox\"
ObjectFile="vc_mswunivuddll\htlbox\"
ProgramDataBaseFileName="vc_mswunivuddll\htlbox.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib 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"
OutputFile="vc_mswunivuddll\htlbox.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\htlbox.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\htlbox\"
ObjectFile="vc_mswudll\htlbox\"
ProgramDataBaseFileName="vc_mswudll\htlbox.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\htlbox.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\htlbox.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\htlbox\"
ObjectFile="vc_mswuddll\htlbox\"
ProgramDataBaseFileName="vc_mswuddll\htlbox.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib 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"
OutputFile="vc_mswuddll\htlbox.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\htlbox.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\htlbox\"
ObjectFile="vc_mswunivu\htlbox\"
ProgramDataBaseFileName="vc_mswunivu\htlbox.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\htlbox.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\htlbox.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\htlbox\"
ObjectFile="vc_mswunivud\htlbox\"
ProgramDataBaseFileName="vc_mswunivud\htlbox.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib 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"
OutputFile="vc_mswunivud\htlbox.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\htlbox.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\htlbox\"
ObjectFile="vc_mswu\htlbox\"
ProgramDataBaseFileName="vc_mswu\htlbox.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\htlbox.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\htlbox.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\htlbox\"
ObjectFile="vc_mswud\htlbox\"
ProgramDataBaseFileName="vc_mswud\htlbox.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib 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"
OutputFile="vc_mswud\htlbox.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\htlbox.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\htlbox.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\htlbox.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/htlbox/makefile.bcc b/samples/htlbox/makefile.bcc
index a1d812ef36..701149201c 100644
--- a/samples/htlbox/makefile.bcc
+++ b/samples/htlbox/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -233,7 +233,7 @@ clean:
-if exist $(OBJS)\htlbox.ils del $(OBJS)\htlbox.ils
$(OBJS)\htlbox.exe: $(HTLBOX_OBJECTS) $(OBJS)\htlbox_htlbox.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/htlbox/makefile.gcc b/samples/htlbox/makefile.gcc
index 4b5cb7b7b4..83c73cb0db 100644
--- a/samples/htlbox/makefile.gcc
+++ b/samples/htlbox/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -228,7 +228,7 @@ clean:
-if exist $(OBJS)\htlbox.exe del $(OBJS)\htlbox.exe
$(OBJS)\htlbox.exe: $(HTLBOX_OBJECTS) $(OBJS)\htlbox_htlbox_rc.o
- $(CXX) -o $@ $(HTLBOX_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(OBJS)\htlbox_htlbox.o: ./htlbox.cpp
$(CXX) -c -o $@ $(HTLBOX_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/htlbox/makefile.unx b/samples/htlbox/makefile.unx
index e821bf345b..de48b54782 100644
--- a/samples/htlbox/makefile.unx
+++ b/samples/htlbox/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild htlbox
-install: all
+install:
uninstall:
diff --git a/samples/htlbox/makefile.vc b/samples/htlbox/makefile.vc
index bc9e534e84..0859328967 100644
--- a/samples/htlbox/makefile.vc
+++ b/samples/htlbox/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -309,7 +309,7 @@ clean:
-if exist $(OBJS)\htlbox.pdb del $(OBJS)\htlbox.pdb
$(OBJS)\htlbox.exe: $(HTLBOX_OBJECTS) $(OBJS)\htlbox_htlbox.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\htlbox.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\htlbox.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/htlbox/makefile.wat b/samples/htlbox/makefile.wat
index b7fb82c48c..6b568a9776 100644
--- a/samples/htlbox/makefile.wat
+++ b/samples/htlbox/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -256,7 +256,7 @@ $(OBJS)\htlbox.exe : $(HTLBOX_OBJECTS) $(OBJS)\htlbox_htlbox.res
@%append $(OBJS)\htlbox.lbc option quiet
@%append $(OBJS)\htlbox.lbc name $^@
@%append $(OBJS)\htlbox.lbc option caseexact
- @%append $(OBJS)\htlbox.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\htlbox.lbc library %i
@%append $(OBJS)\htlbox.lbc option resource=$(OBJS)\htlbox_htlbox.res
diff --git a/samples/html/Makefile.in b/samples/html/Makefile.in
index d216c12f73..ff586d889d 100644
--- a/samples/html/Makefile.in
+++ b/samples/html/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -23,7 +23,7 @@ DESTDIR =
all: about help helpview printing test virtual widget zip
-install: all
+install:
uninstall:
@@ -78,6 +78,7 @@ zip:
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
-.PHONY: all install uninstall clean distclean about help helpview printing test virtual widget zip
+.PHONY: all install uninstall clean distclean about help helpview printing test \
+ virtual widget zip
diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in
index 7af3758c23..841ea995d6 100644
--- a/samples/html/about/Makefile.in
+++ b/samples/html/about/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -60,7 +60,7 @@ ABOUT_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -114,28 +114,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: about$(EXEEXT) $(__about_bundle___depname) data_files
-install: all
+install:
uninstall:
@@ -151,7 +151,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
about$(EXEEXT): $(ABOUT_OBJECTS) $(__about___win32rc)
- $(CXX) -o $@ $(ABOUT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
+ $(CXX) -o $@ $(ABOUT_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
$(__about___mac_setfilecmd)
$(__about___os2_emxbindcmd)
@@ -208,6 +208,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean about_bundle data_files
diff --git a/samples/html/about/about_vc7.vcproj b/samples/html/about/about_vc7.vcproj
index 30a3bd6577..45a235f692 100644
--- a/samples/html/about/about_vc7.vcproj
+++ b/samples/html/about/about_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\about"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\about\"
ObjectFile="vc_mswunivudll\about\"
ProgramDataBaseFileName="vc_mswunivudll\about.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\about.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\about.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\about_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\about"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\about\"
ObjectFile="vc_mswunivuddll\about\"
ProgramDataBaseFileName="vc_mswunivuddll\about.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib 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"
OutputFile="vc_mswunivuddll\about.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\about.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\about_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\about"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\about\"
ObjectFile="vc_mswudll\about\"
ProgramDataBaseFileName="vc_mswudll\about.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\about.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\about.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\about_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\about"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\about\"
ObjectFile="vc_mswuddll\about\"
ProgramDataBaseFileName="vc_mswuddll\about.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib 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"
OutputFile="vc_mswuddll\about.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\about.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\about_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\about"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\about\"
ObjectFile="vc_mswunivu\about\"
ProgramDataBaseFileName="vc_mswunivu\about.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\about.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\about.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\about_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\about"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\about\"
ObjectFile="vc_mswunivud\about\"
ProgramDataBaseFileName="vc_mswunivud\about.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib 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"
OutputFile="vc_mswunivud\about.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\about.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\about_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\about"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\about\"
ObjectFile="vc_mswu\about\"
ProgramDataBaseFileName="vc_mswu\about.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\about.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\about.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\about_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\about"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\about\"
ObjectFile="vc_mswud\about\"
ProgramDataBaseFileName="vc_mswud\about.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib 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"
OutputFile="vc_mswud\about.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\about.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\about_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\about.cpp"/>
+ RelativePath=".\about.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\about.rc"/>
+ RelativePath=".\about.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/html/about/about_vc8.vcproj b/samples/html/about/about_vc8.vcproj
index 4f1ba50c18..606d876fa6 100644
--- a/samples/html/about/about_vc8.vcproj
+++ b/samples/html/about/about_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\about\"
ObjectFile="vc_mswunivudll\about\"
ProgramDataBaseFileName="vc_mswunivudll\about.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\about.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\about.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\about\"
ObjectFile="vc_mswunivuddll\about\"
ProgramDataBaseFileName="vc_mswunivuddll\about.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib 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"
OutputFile="vc_mswunivuddll\about.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\about.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\about\"
ObjectFile="vc_mswudll\about\"
ProgramDataBaseFileName="vc_mswudll\about.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\about.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\about.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\about\"
ObjectFile="vc_mswuddll\about\"
ProgramDataBaseFileName="vc_mswuddll\about.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib 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"
OutputFile="vc_mswuddll\about.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\about.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\about\"
ObjectFile="vc_mswunivu\about\"
ProgramDataBaseFileName="vc_mswunivu\about.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\about.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\about.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\about\"
ObjectFile="vc_mswunivud\about\"
ProgramDataBaseFileName="vc_mswunivud\about.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib 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"
OutputFile="vc_mswunivud\about.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\about.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\about\"
ObjectFile="vc_mswu\about\"
ProgramDataBaseFileName="vc_mswu\about.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\about.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\about.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\about\"
ObjectFile="vc_mswud\about\"
ProgramDataBaseFileName="vc_mswud\about.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib 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"
OutputFile="vc_mswud\about.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\about.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\about.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\about.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/html/about/makefile.bcc b/samples/html/about/makefile.bcc
index df2db10352..c2c119438f 100644
--- a/samples/html/about/makefile.bcc
+++ b/samples/html/about/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -233,7 +233,7 @@ clean:
-if exist $(OBJS)\about.ils del $(OBJS)\about.ils
$(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_about.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/html/about/makefile.gcc b/samples/html/about/makefile.gcc
index 5fc68c2ce0..12557598f8 100644
--- a/samples/html/about/makefile.gcc
+++ b/samples/html/about/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -228,7 +228,7 @@ clean:
-if exist $(OBJS)\about.exe del $(OBJS)\about.exe
$(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_about_rc.o
- $(CXX) -o $@ $(ABOUT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
data_files:
if not exist $(OBJS)\data mkdir $(OBJS)\data
diff --git a/samples/html/about/makefile.unx b/samples/html/about/makefile.unx
index 0e114547e7..77dc9af3f8 100644
--- a/samples/html/about/makefile.unx
+++ b/samples/html/about/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild about
-install: all
+install:
uninstall:
diff --git a/samples/html/about/makefile.vc b/samples/html/about/makefile.vc
index 7a774a311b..1fcab96339 100644
--- a/samples/html/about/makefile.vc
+++ b/samples/html/about/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -309,7 +309,7 @@ clean:
-if exist $(OBJS)\about.pdb del $(OBJS)\about.pdb
$(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_about.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\about.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\about.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/html/about/makefile.wat b/samples/html/about/makefile.wat
index 98dce4f8ca..43c3e86d4d 100644
--- a/samples/html/about/makefile.wat
+++ b/samples/html/about/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -256,7 +256,7 @@ $(OBJS)\about.exe : $(ABOUT_OBJECTS) $(OBJS)\about_about.res
@%append $(OBJS)\about.lbc option quiet
@%append $(OBJS)\about.lbc name $^@
@%append $(OBJS)\about.lbc option caseexact
- @%append $(OBJS)\about.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\about.lbc library %i
@%append $(OBJS)\about.lbc option resource=$(OBJS)\about_about.res
diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in
index b1544a311b..eb8288cf2f 100644
--- a/samples/html/help/Makefile.in
+++ b/samples/html/help/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -60,7 +60,7 @@ HTMLHELP_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -114,28 +114,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: htmlhelp$(EXEEXT) $(__htmlhelp_bundle___depname) data
-install: all
+install:
uninstall:
@@ -151,7 +151,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
htmlhelp$(EXEEXT): $(HTMLHELP_OBJECTS) $(__htmlhelp___win32rc)
- $(CXX) -o $@ $(HTMLHELP_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
+ $(CXX) -o $@ $(HTMLHELP_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
$(__htmlhelp___mac_setfilecmd)
$(__htmlhelp___os2_emxbindcmd)
@@ -208,6 +208,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean htmlhelp_bundle data
diff --git a/samples/html/help/help_vc7.vcproj b/samples/html/help/help_vc7.vcproj
index c4eb1347e4..305969c8ed 100644
--- a/samples/html/help/help_vc7.vcproj
+++ b/samples/html/help/help_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\htmlhelp"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\htmlhelp\"
ObjectFile="vc_mswunivudll\htmlhelp\"
ProgramDataBaseFileName="vc_mswunivudll\htmlhelp.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\htmlhelp.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\htmlhelp.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\help_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\htmlhelp"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\htmlhelp\"
ObjectFile="vc_mswunivuddll\htmlhelp\"
ProgramDataBaseFileName="vc_mswunivuddll\htmlhelp.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib 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"
OutputFile="vc_mswunivuddll\htmlhelp.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\htmlhelp.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\help_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\htmlhelp"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\htmlhelp\"
ObjectFile="vc_mswudll\htmlhelp\"
ProgramDataBaseFileName="vc_mswudll\htmlhelp.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\htmlhelp.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\htmlhelp.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\help_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\htmlhelp"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\htmlhelp\"
ObjectFile="vc_mswuddll\htmlhelp\"
ProgramDataBaseFileName="vc_mswuddll\htmlhelp.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib 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"
OutputFile="vc_mswuddll\htmlhelp.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\htmlhelp.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\help_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\htmlhelp"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\htmlhelp\"
ObjectFile="vc_mswunivu\htmlhelp\"
ProgramDataBaseFileName="vc_mswunivu\htmlhelp.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\htmlhelp.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\htmlhelp.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\help_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\htmlhelp"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\htmlhelp\"
ObjectFile="vc_mswunivud\htmlhelp\"
ProgramDataBaseFileName="vc_mswunivud\htmlhelp.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib 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"
OutputFile="vc_mswunivud\htmlhelp.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\htmlhelp.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\help_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\htmlhelp"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\htmlhelp\"
ObjectFile="vc_mswu\htmlhelp\"
ProgramDataBaseFileName="vc_mswu\htmlhelp.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\htmlhelp.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\htmlhelp.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\help_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\htmlhelp"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\htmlhelp\"
ObjectFile="vc_mswud\htmlhelp\"
ProgramDataBaseFileName="vc_mswud\htmlhelp.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib 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"
OutputFile="vc_mswud\htmlhelp.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\htmlhelp.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\help_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\help.cpp"/>
+ RelativePath=".\help.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\help.rc"/>
+ RelativePath=".\help.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/html/help/help_vc8.vcproj b/samples/html/help/help_vc8.vcproj
index 6d4c13e920..c730a33337 100644
--- a/samples/html/help/help_vc8.vcproj
+++ b/samples/html/help/help_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\htmlhelp\"
ObjectFile="vc_mswunivudll\htmlhelp\"
ProgramDataBaseFileName="vc_mswunivudll\htmlhelp.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\htmlhelp.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\htmlhelp.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\htmlhelp\"
ObjectFile="vc_mswunivuddll\htmlhelp\"
ProgramDataBaseFileName="vc_mswunivuddll\htmlhelp.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib 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"
OutputFile="vc_mswunivuddll\htmlhelp.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\htmlhelp.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\htmlhelp\"
ObjectFile="vc_mswudll\htmlhelp\"
ProgramDataBaseFileName="vc_mswudll\htmlhelp.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\htmlhelp.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\htmlhelp.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\htmlhelp\"
ObjectFile="vc_mswuddll\htmlhelp\"
ProgramDataBaseFileName="vc_mswuddll\htmlhelp.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib 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"
OutputFile="vc_mswuddll\htmlhelp.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\htmlhelp.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\htmlhelp\"
ObjectFile="vc_mswunivu\htmlhelp\"
ProgramDataBaseFileName="vc_mswunivu\htmlhelp.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\htmlhelp.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\htmlhelp.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\htmlhelp\"
ObjectFile="vc_mswunivud\htmlhelp\"
ProgramDataBaseFileName="vc_mswunivud\htmlhelp.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib 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"
OutputFile="vc_mswunivud\htmlhelp.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\htmlhelp.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\htmlhelp\"
ObjectFile="vc_mswu\htmlhelp\"
ProgramDataBaseFileName="vc_mswu\htmlhelp.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\htmlhelp.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\htmlhelp.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\htmlhelp\"
ObjectFile="vc_mswud\htmlhelp\"
ProgramDataBaseFileName="vc_mswud\htmlhelp.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib 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"
OutputFile="vc_mswud\htmlhelp.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\htmlhelp.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\help.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\help.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/html/help/makefile.bcc b/samples/html/help/makefile.bcc
index f4249827cd..e8abe6a9d2 100644
--- a/samples/html/help/makefile.bcc
+++ b/samples/html/help/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -233,7 +233,7 @@ clean:
-if exist $(OBJS)\htmlhelp.ils del $(OBJS)\htmlhelp.ils
$(OBJS)\htmlhelp.exe: $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_help.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/html/help/makefile.gcc b/samples/html/help/makefile.gcc
index b34f7e44db..27931c8779 100644
--- a/samples/html/help/makefile.gcc
+++ b/samples/html/help/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -228,7 +228,7 @@ clean:
-if exist $(OBJS)\htmlhelp.exe del $(OBJS)\htmlhelp.exe
$(OBJS)\htmlhelp.exe: $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_help_rc.o
- $(CXX) -o $@ $(HTMLHELP_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
data:
if not exist $(OBJS)\helpfiles mkdir $(OBJS)\helpfiles
diff --git a/samples/html/help/makefile.unx b/samples/html/help/makefile.unx
index aa72810637..dacb898a38 100644
--- a/samples/html/help/makefile.unx
+++ b/samples/html/help/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild htmlhelp
-install: all
+install:
uninstall:
diff --git a/samples/html/help/makefile.vc b/samples/html/help/makefile.vc
index 28bb173a17..6ee86b74da 100644
--- a/samples/html/help/makefile.vc
+++ b/samples/html/help/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -309,7 +309,7 @@ clean:
-if exist $(OBJS)\htmlhelp.pdb del $(OBJS)\htmlhelp.pdb
$(OBJS)\htmlhelp.exe: $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_help.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\htmlhelp.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\htmlhelp.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/html/help/makefile.wat b/samples/html/help/makefile.wat
index eb57cfc5fc..a4ccdf0392 100644
--- a/samples/html/help/makefile.wat
+++ b/samples/html/help/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -256,7 +256,7 @@ $(OBJS)\htmlhelp.exe : $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_help.res
@%append $(OBJS)\htmlhelp.lbc option quiet
@%append $(OBJS)\htmlhelp.lbc name $^@
@%append $(OBJS)\htmlhelp.lbc option caseexact
- @%append $(OBJS)\htmlhelp.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\htmlhelp.lbc library %i
@%append $(OBJS)\htmlhelp.lbc option resource=$(OBJS)\htmlhelp_help.res
diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in
index 1a5748f1e2..2ccaccec36 100644
--- a/samples/html/helpview/Makefile.in
+++ b/samples/html/helpview/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -60,7 +60,7 @@ HELPVIEW_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -114,28 +114,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: helpview$(EXEEXT) $(__helpview_bundle___depname) data
-install: all
+install:
uninstall:
@@ -151,7 +151,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc)
- $(CXX) -o $@ $(HELPVIEW_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
+ $(CXX) -o $@ $(HELPVIEW_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
$(__helpview___mac_setfilecmd)
$(__helpview___os2_emxbindcmd)
@@ -208,6 +208,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean helpview_bundle data
diff --git a/samples/html/helpview/helpview_vc7.vcproj b/samples/html/helpview/helpview_vc7.vcproj
index 0263a923db..015878530a 100644
--- a/samples/html/helpview/helpview_vc7.vcproj
+++ b/samples/html/helpview/helpview_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\helpview"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\helpview\"
ObjectFile="vc_mswunivudll\helpview\"
ProgramDataBaseFileName="vc_mswunivudll\helpview.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\helpview.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\helpview.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\helpview_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\helpview"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\helpview\"
ObjectFile="vc_mswunivuddll\helpview\"
ProgramDataBaseFileName="vc_mswunivuddll\helpview.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib 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"
OutputFile="vc_mswunivuddll\helpview.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\helpview.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\helpview_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\helpview"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\helpview\"
ObjectFile="vc_mswudll\helpview\"
ProgramDataBaseFileName="vc_mswudll\helpview.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\helpview.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\helpview.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\helpview_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\helpview"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\helpview\"
ObjectFile="vc_mswuddll\helpview\"
ProgramDataBaseFileName="vc_mswuddll\helpview.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib 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"
OutputFile="vc_mswuddll\helpview.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\helpview.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\helpview_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\helpview"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\helpview\"
ObjectFile="vc_mswunivu\helpview\"
ProgramDataBaseFileName="vc_mswunivu\helpview.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\helpview.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\helpview.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\helpview_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\helpview"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\helpview\"
ObjectFile="vc_mswunivud\helpview\"
ProgramDataBaseFileName="vc_mswunivud\helpview.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib 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"
OutputFile="vc_mswunivud\helpview.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\helpview.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\helpview_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\helpview"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\helpview\"
ObjectFile="vc_mswu\helpview\"
ProgramDataBaseFileName="vc_mswu\helpview.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\helpview.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\helpview.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\helpview_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\helpview"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\helpview\"
ObjectFile="vc_mswud\helpview\"
ProgramDataBaseFileName="vc_mswud\helpview.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib 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"
OutputFile="vc_mswud\helpview.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\helpview.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\helpview_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\helpview.cpp"/>
+ RelativePath=".\helpview.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\helpview.rc"/>
+ RelativePath=".\helpview.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/html/helpview/helpview_vc8.vcproj b/samples/html/helpview/helpview_vc8.vcproj
index b9209ddfc5..f28d2c6d02 100644
--- a/samples/html/helpview/helpview_vc8.vcproj
+++ b/samples/html/helpview/helpview_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\helpview\"
ObjectFile="vc_mswunivudll\helpview\"
ProgramDataBaseFileName="vc_mswunivudll\helpview.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\helpview.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\helpview.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\helpview\"
ObjectFile="vc_mswunivuddll\helpview\"
ProgramDataBaseFileName="vc_mswunivuddll\helpview.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib 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"
OutputFile="vc_mswunivuddll\helpview.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\helpview.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\helpview\"
ObjectFile="vc_mswudll\helpview\"
ProgramDataBaseFileName="vc_mswudll\helpview.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\helpview.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\helpview.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\helpview\"
ObjectFile="vc_mswuddll\helpview\"
ProgramDataBaseFileName="vc_mswuddll\helpview.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib 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"
OutputFile="vc_mswuddll\helpview.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\helpview.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\helpview\"
ObjectFile="vc_mswunivu\helpview\"
ProgramDataBaseFileName="vc_mswunivu\helpview.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\helpview.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\helpview.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\helpview\"
ObjectFile="vc_mswunivud\helpview\"
ProgramDataBaseFileName="vc_mswunivud\helpview.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib 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"
OutputFile="vc_mswunivud\helpview.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\helpview.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\helpview\"
ObjectFile="vc_mswu\helpview\"
ProgramDataBaseFileName="vc_mswu\helpview.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\helpview.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\helpview.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\helpview\"
ObjectFile="vc_mswud\helpview\"
ProgramDataBaseFileName="vc_mswud\helpview.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib 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"
OutputFile="vc_mswud\helpview.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\helpview.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\helpview.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\helpview.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/html/helpview/makefile.bcc b/samples/html/helpview/makefile.bcc
index 3807335dff..235a5e6dbb 100644
--- a/samples/html/helpview/makefile.bcc
+++ b/samples/html/helpview/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -233,7 +233,7 @@ clean:
-if exist $(OBJS)\helpview.ils del $(OBJS)\helpview.ils
$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/html/helpview/makefile.gcc b/samples/html/helpview/makefile.gcc
index e6337d32a2..e651942116 100644
--- a/samples/html/helpview/makefile.gcc
+++ b/samples/html/helpview/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -228,7 +228,7 @@ clean:
-if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe
$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview_rc.o
- $(CXX) -o $@ $(HELPVIEW_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
data:
if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/html/helpview/makefile.unx b/samples/html/helpview/makefile.unx
index 60584a6c51..ef6094a6ef 100644
--- a/samples/html/helpview/makefile.unx
+++ b/samples/html/helpview/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild helpview
-install: all
+install:
uninstall:
diff --git a/samples/html/helpview/makefile.vc b/samples/html/helpview/makefile.vc
index 7c022eeb7c..ee70342703 100644
--- a/samples/html/helpview/makefile.vc
+++ b/samples/html/helpview/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -309,7 +309,7 @@ clean:
-if exist $(OBJS)\helpview.pdb del $(OBJS)\helpview.pdb
$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\helpview.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\helpview.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/html/helpview/makefile.wat b/samples/html/helpview/makefile.wat
index 11f51fffbc..e4270dfadf 100644
--- a/samples/html/helpview/makefile.wat
+++ b/samples/html/helpview/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -256,7 +256,7 @@ $(OBJS)\helpview.exe : $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res
@%append $(OBJS)\helpview.lbc option quiet
@%append $(OBJS)\helpview.lbc name $^@
@%append $(OBJS)\helpview.lbc option caseexact
- @%append $(OBJS)\helpview.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\helpview.lbc library %i
@%append $(OBJS)\helpview.lbc option resource=$(OBJS)\helpview_helpview.res
diff --git a/samples/html/htmlctrl/Makefile.in b/samples/html/htmlctrl/Makefile.in
index 8866f92d46..e5501e83af 100644
--- a/samples/html/htmlctrl/Makefile.in
+++ b/samples/html/htmlctrl/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ HTMLCTRL_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: htmlctrl$(EXEEXT) $(__htmlctrl_bundle___depname)
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
htmlctrl$(EXEEXT): $(HTMLCTRL_OBJECTS) $(__htmlctrl___win32rc)
- $(CXX) -o $@ $(HTMLCTRL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(HTMLCTRL_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)
$(__htmlctrl___mac_setfilecmd)
$(__htmlctrl___os2_emxbindcmd)
@@ -192,6 +192,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean htmlctrl_bundle
diff --git a/samples/html/htmlctrl/makefile.unx b/samples/html/htmlctrl/makefile.unx
index ae3d4f1089..e5f29d96da 100644
--- a/samples/html/htmlctrl/makefile.unx
+++ b/samples/html/htmlctrl/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild htmlctrl
-install: all
+install:
uninstall:
diff --git a/samples/html/makefile.bcc b/samples/html/makefile.bcc
index 1463674321..7fadd72d38 100644
--- a/samples/html/makefile.bcc
+++ b/samples/html/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -28,8 +28,9 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
-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_RICHTEXT="$(USE_RICHTEXT)" \
- -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \
+ -DUSE_AUI="$(USE_AUI)" -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)" \
diff --git a/samples/html/makefile.gcc b/samples/html/makefile.gcc
index cf027a3827..627f50e579 100644
--- a/samples/html/makefile.gcc
+++ b/samples/html/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -20,8 +20,8 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
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_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
- USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
+ 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)" \
diff --git a/samples/html/makefile.unx b/samples/html/makefile.unx
index 15b41eabf9..5484cec0bb 100644
--- a/samples/html/makefile.unx
+++ b/samples/html/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -27,7 +27,7 @@
all: about help helpview printing test virtual widget zip
-install: all
+install:
uninstall:
diff --git a/samples/html/makefile.vc b/samples/html/makefile.vc
index 8cca58cbdb..123a6ff45b 100644
--- a/samples/html/makefile.vc
+++ b/samples/html/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -19,8 +19,8 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
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_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
- USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
+ 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)" \
diff --git a/samples/html/makefile.wat b/samples/html/makefile.wat
index d5acd4a806..9feaf597e9 100644
--- a/samples/html/makefile.wat
+++ b/samples/html/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -36,8 +36,8 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
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_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" &
- USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" &
+ 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)" &
diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in
index 99bf190843..adce3e2d9f 100644
--- a/samples/html/printing/Makefile.in
+++ b/samples/html/printing/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -60,7 +60,7 @@ HTMLPRINTING_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -120,28 +120,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: htmlprinting$(EXEEXT) $(__htmlprinting_bundle___depname) data
-install: all
+install:
uninstall:
@@ -157,7 +157,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
htmlprinting$(EXEEXT): $(HTMLPRINTING_OBJECTS) $(__htmlprinting___win32rc)
- $(CXX) -o $@ $(HTMLPRINTING_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
+ $(CXX) -o $@ $(HTMLPRINTING_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
$(__htmlprinting___mac_setfilecmd)
$(__htmlprinting___os2_emxbindcmd)
@@ -214,6 +214,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean htmlprinting_bundle data
diff --git a/samples/html/printing/makefile.bcc b/samples/html/printing/makefile.bcc
index be14327b60..1c0c2444fa 100644
--- a/samples/html/printing/makefile.bcc
+++ b/samples/html/printing/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -233,7 +233,7 @@ clean:
-if exist $(OBJS)\htmlprinting.ils del $(OBJS)\htmlprinting.ils
$(OBJS)\htmlprinting.exe: $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_printing.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/html/printing/makefile.gcc b/samples/html/printing/makefile.gcc
index 6ae8133c3a..e8c9542580 100644
--- a/samples/html/printing/makefile.gcc
+++ b/samples/html/printing/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -228,7 +228,7 @@ clean:
-if exist $(OBJS)\htmlprinting.exe del $(OBJS)\htmlprinting.exe
$(OBJS)\htmlprinting.exe: $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_printing_rc.o
- $(CXX) -o $@ $(HTMLPRINTING_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
data:
if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/html/printing/makefile.unx b/samples/html/printing/makefile.unx
index 07fd01a85b..f2bcefcce6 100644
--- a/samples/html/printing/makefile.unx
+++ b/samples/html/printing/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild htmlprinting
-install: all
+install:
uninstall:
diff --git a/samples/html/printing/makefile.vc b/samples/html/printing/makefile.vc
index 1e081ba6f0..9e9600e83c 100644
--- a/samples/html/printing/makefile.vc
+++ b/samples/html/printing/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -309,7 +309,7 @@ clean:
-if exist $(OBJS)\htmlprinting.pdb del $(OBJS)\htmlprinting.pdb
$(OBJS)\htmlprinting.exe: $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_printing.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\htmlprinting.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\htmlprinting.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/html/printing/makefile.wat b/samples/html/printing/makefile.wat
index be7ffe4ea6..3c120ffff7 100644
--- a/samples/html/printing/makefile.wat
+++ b/samples/html/printing/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -256,7 +256,7 @@ $(OBJS)\htmlprinting.exe : $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_printin
@%append $(OBJS)\htmlprinting.lbc option quiet
@%append $(OBJS)\htmlprinting.lbc name $^@
@%append $(OBJS)\htmlprinting.lbc option caseexact
- @%append $(OBJS)\htmlprinting.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\htmlprinting.lbc library %i
@%append $(OBJS)\htmlprinting.lbc option resource=$(OBJS)\htmlprinting_printing.res
diff --git a/samples/html/printing/printing_vc7.vcproj b/samples/html/printing/printing_vc7.vcproj
index 1417ba5cf8..8c657ebaf2 100644
--- a/samples/html/printing/printing_vc7.vcproj
+++ b/samples/html/printing/printing_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\htmlprinting"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\htmlprinting\"
ObjectFile="vc_mswunivudll\htmlprinting\"
ProgramDataBaseFileName="vc_mswunivudll\htmlprinting.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\htmlprinting.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\htmlprinting.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\printing_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\htmlprinting"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\htmlprinting\"
ObjectFile="vc_mswunivuddll\htmlprinting\"
ProgramDataBaseFileName="vc_mswunivuddll\htmlprinting.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib 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"
OutputFile="vc_mswunivuddll\htmlprinting.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\htmlprinting.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\printing_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\htmlprinting"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\htmlprinting\"
ObjectFile="vc_mswudll\htmlprinting\"
ProgramDataBaseFileName="vc_mswudll\htmlprinting.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\htmlprinting.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\htmlprinting.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\printing_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\htmlprinting"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\htmlprinting\"
ObjectFile="vc_mswuddll\htmlprinting\"
ProgramDataBaseFileName="vc_mswuddll\htmlprinting.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib 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"
OutputFile="vc_mswuddll\htmlprinting.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\htmlprinting.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\printing_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\htmlprinting"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\htmlprinting\"
ObjectFile="vc_mswunivu\htmlprinting\"
ProgramDataBaseFileName="vc_mswunivu\htmlprinting.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\htmlprinting.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\htmlprinting.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\printing_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\htmlprinting"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\htmlprinting\"
ObjectFile="vc_mswunivud\htmlprinting\"
ProgramDataBaseFileName="vc_mswunivud\htmlprinting.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib 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"
OutputFile="vc_mswunivud\htmlprinting.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\htmlprinting.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\printing_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\htmlprinting"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\htmlprinting\"
ObjectFile="vc_mswu\htmlprinting\"
ProgramDataBaseFileName="vc_mswu\htmlprinting.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\htmlprinting.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\htmlprinting.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\printing_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\htmlprinting"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\htmlprinting\"
ObjectFile="vc_mswud\htmlprinting\"
ProgramDataBaseFileName="vc_mswud\htmlprinting.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib 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"
OutputFile="vc_mswud\htmlprinting.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\htmlprinting.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\printing_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\printing.cpp"/>
+ RelativePath=".\printing.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\printing.rc"/>
+ RelativePath=".\printing.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/html/printing/printing_vc8.vcproj b/samples/html/printing/printing_vc8.vcproj
index 92bc4f9d50..3437d8fbd6 100644
--- a/samples/html/printing/printing_vc8.vcproj
+++ b/samples/html/printing/printing_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\htmlprinting\"
ObjectFile="vc_mswunivudll\htmlprinting\"
ProgramDataBaseFileName="vc_mswunivudll\htmlprinting.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\htmlprinting.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\htmlprinting.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\htmlprinting\"
ObjectFile="vc_mswunivuddll\htmlprinting\"
ProgramDataBaseFileName="vc_mswunivuddll\htmlprinting.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib 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"
OutputFile="vc_mswunivuddll\htmlprinting.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\htmlprinting.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\htmlprinting\"
ObjectFile="vc_mswudll\htmlprinting\"
ProgramDataBaseFileName="vc_mswudll\htmlprinting.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\htmlprinting.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\htmlprinting.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\htmlprinting\"
ObjectFile="vc_mswuddll\htmlprinting\"
ProgramDataBaseFileName="vc_mswuddll\htmlprinting.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib 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"
OutputFile="vc_mswuddll\htmlprinting.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\htmlprinting.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\htmlprinting\"
ObjectFile="vc_mswunivu\htmlprinting\"
ProgramDataBaseFileName="vc_mswunivu\htmlprinting.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\htmlprinting.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\htmlprinting.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\htmlprinting\"
ObjectFile="vc_mswunivud\htmlprinting\"
ProgramDataBaseFileName="vc_mswunivud\htmlprinting.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib 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"
OutputFile="vc_mswunivud\htmlprinting.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\htmlprinting.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\htmlprinting\"
ObjectFile="vc_mswu\htmlprinting\"
ProgramDataBaseFileName="vc_mswu\htmlprinting.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\htmlprinting.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\htmlprinting.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\htmlprinting\"
ObjectFile="vc_mswud\htmlprinting\"
ProgramDataBaseFileName="vc_mswud\htmlprinting.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib 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"
OutputFile="vc_mswud\htmlprinting.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\htmlprinting.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\printing.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\printing.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in
index a020bbd834..5b822a85ec 100644
--- a/samples/html/test/Makefile.in
+++ b/samples/html/test/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -60,7 +60,7 @@ TEST_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -117,28 +117,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: test$(EXEEXT) $(__test_bundle___depname) data
-install: all
+install:
uninstall:
@@ -154,7 +154,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc)
- $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_NET_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)
+ $(CXX) -o $@ $(TEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_NET_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)
$(__test___mac_setfilecmd)
$(__test___os2_emxbindcmd)
@@ -211,6 +211,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean test_bundle data
diff --git a/samples/html/test/makefile.bcc b/samples/html/test/makefile.bcc
index 5b11410b2c..5bf7fac5a3 100644
--- a/samples/html/test/makefile.bcc
+++ b/samples/html/test/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -237,7 +237,7 @@ clean:
-if exist $(OBJS)\test.ils del $(OBJS)\test.ils
$(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_test.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/html/test/makefile.gcc b/samples/html/test/makefile.gcc
index 1697799cfd..c7465d1f60 100644
--- a/samples/html/test/makefile.gcc
+++ b/samples/html/test/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -232,7 +232,7 @@ clean:
-if exist $(OBJS)\test.exe del $(OBJS)\test.exe
$(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_test_rc.o
- $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
data:
if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/html/test/makefile.unx b/samples/html/test/makefile.unx
index 539a1d565e..7ee1b8d07f 100644
--- a/samples/html/test/makefile.unx
+++ b/samples/html/test/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild test
-install: all
+install:
uninstall:
diff --git a/samples/html/test/makefile.vc b/samples/html/test/makefile.vc
index 200dbb3d65..02971308a6 100644
--- a/samples/html/test/makefile.vc
+++ b/samples/html/test/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -313,7 +313,7 @@ clean:
-if exist $(OBJS)\test.pdb del $(OBJS)\test.pdb
$(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_test.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\test.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\test.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/html/test/makefile.wat b/samples/html/test/makefile.wat
index 37d4afa47a..27c9accbb6 100644
--- a/samples/html/test/makefile.wat
+++ b/samples/html/test/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -261,7 +261,7 @@ $(OBJS)\test.exe : $(TEST_OBJECTS) $(OBJS)\test_test.res
@%append $(OBJS)\test.lbc option quiet
@%append $(OBJS)\test.lbc name $^@
@%append $(OBJS)\test.lbc option caseexact
- @%append $(OBJS)\test.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\test.lbc library %i
@%append $(OBJS)\test.lbc option resource=$(OBJS)\test_test.res
diff --git a/samples/html/test/test_vc7.vcproj b/samples/html/test/test_vc7.vcproj
index 8651645d91..d37eea6724 100644
--- a/samples/html/test/test_vc7.vcproj
+++ b/samples/html/test/test_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\test"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\test\"
ObjectFile="vc_mswunivudll\test\"
ProgramDataBaseFileName="vc_mswunivudll\test.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\test.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\test.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\test_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\test"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\test\"
ObjectFile="vc_mswunivuddll\test\"
ProgramDataBaseFileName="vc_mswunivuddll\test.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib wxmswuniv29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib wxmswuniv29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswunivuddll\test.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\test.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\test_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\test"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\test\"
ObjectFile="vc_mswudll\test\"
ProgramDataBaseFileName="vc_mswudll\test.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\test.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\test.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\test_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\test"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\test\"
ObjectFile="vc_mswuddll\test\"
ProgramDataBaseFileName="vc_mswuddll\test.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib wxmsw29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib wxmsw29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswuddll\test.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\test.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\test_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\test"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\test\"
ObjectFile="vc_mswunivu\test\"
ProgramDataBaseFileName="vc_mswunivu\test.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\test.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\test.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\test_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\test"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\test\"
ObjectFile="vc_mswunivud\test\"
ProgramDataBaseFileName="vc_mswunivud\test.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib wxmswuniv29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib wxmswuniv29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswunivud\test.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\test.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\test_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\test"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\test\"
ObjectFile="vc_mswu\test\"
ProgramDataBaseFileName="vc_mswu\test.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\test.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\test.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\test_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\test"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\test\"
ObjectFile="vc_mswud\test\"
ProgramDataBaseFileName="vc_mswud\test.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib wxmsw29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib wxmsw29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswud\test.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\test.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\test_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\test.cpp"/>
+ RelativePath=".\test.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\test.rc"/>
+ RelativePath=".\test.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/html/test/test_vc8.vcproj b/samples/html/test/test_vc8.vcproj
index 7aaf364235..56bc69bd22 100644
--- a/samples/html/test/test_vc8.vcproj
+++ b/samples/html/test/test_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\test\"
ObjectFile="vc_mswunivudll\test\"
ProgramDataBaseFileName="vc_mswunivudll\test.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\test.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\test.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\test\"
ObjectFile="vc_mswunivuddll\test\"
ProgramDataBaseFileName="vc_mswunivuddll\test.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib wxmswuniv29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib wxmswuniv29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswunivuddll\test.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\test.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\test\"
ObjectFile="vc_mswudll\test\"
ProgramDataBaseFileName="vc_mswudll\test.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\test.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\test.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\test\"
ObjectFile="vc_mswuddll\test\"
ProgramDataBaseFileName="vc_mswuddll\test.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib wxmsw29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib wxmsw29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswuddll\test.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\test.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\test\"
ObjectFile="vc_mswunivu\test\"
ProgramDataBaseFileName="vc_mswunivu\test.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\test.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\test.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\test\"
ObjectFile="vc_mswunivud\test\"
ProgramDataBaseFileName="vc_mswunivud\test.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib wxmswuniv29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib wxmswuniv29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswunivud\test.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\test.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\test\"
ObjectFile="vc_mswu\test\"
ProgramDataBaseFileName="vc_mswu\test.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\test.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\test.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\test\"
ObjectFile="vc_mswud\test\"
ProgramDataBaseFileName="vc_mswud\test.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib wxmsw29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib wxmsw29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswud\test.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\test.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\test.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\test.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/html/virtual/Makefile.in b/samples/html/virtual/Makefile.in
index 3e848d4194..f491520166 100644
--- a/samples/html/virtual/Makefile.in
+++ b/samples/html/virtual/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -60,7 +60,7 @@ VIRTUAL_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -114,28 +114,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: virtual$(EXEEXT) $(__virtual_bundle___depname) data
-install: all
+install:
uninstall:
@@ -151,7 +151,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
virtual$(EXEEXT): $(VIRTUAL_OBJECTS) $(__virtual___win32rc)
- $(CXX) -o $@ $(VIRTUAL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
+ $(CXX) -o $@ $(VIRTUAL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
$(__virtual___mac_setfilecmd)
$(__virtual___os2_emxbindcmd)
@@ -208,6 +208,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean virtual_bundle data
diff --git a/samples/html/virtual/makefile.bcc b/samples/html/virtual/makefile.bcc
index 2385eda0b3..286ef9abaf 100644
--- a/samples/html/virtual/makefile.bcc
+++ b/samples/html/virtual/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -233,7 +233,7 @@ clean:
-if exist $(OBJS)\virtual.ils del $(OBJS)\virtual.ils
$(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/html/virtual/makefile.gcc b/samples/html/virtual/makefile.gcc
index d4cc76b427..59556ab1f8 100644
--- a/samples/html/virtual/makefile.gcc
+++ b/samples/html/virtual/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -228,7 +228,7 @@ clean:
-if exist $(OBJS)\virtual.exe del $(OBJS)\virtual.exe
$(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual_rc.o
- $(CXX) -o $@ $(VIRTUAL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
data:
if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/html/virtual/makefile.unx b/samples/html/virtual/makefile.unx
index 862a2dba9d..8a824c092a 100644
--- a/samples/html/virtual/makefile.unx
+++ b/samples/html/virtual/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild virtual
-install: all
+install:
uninstall:
diff --git a/samples/html/virtual/makefile.vc b/samples/html/virtual/makefile.vc
index 4fd5eacddb..5432964362 100644
--- a/samples/html/virtual/makefile.vc
+++ b/samples/html/virtual/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -309,7 +309,7 @@ clean:
-if exist $(OBJS)\virtual.pdb del $(OBJS)\virtual.pdb
$(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\virtual.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\virtual.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/html/virtual/makefile.wat b/samples/html/virtual/makefile.wat
index 97b0d31a44..836224eaee 100644
--- a/samples/html/virtual/makefile.wat
+++ b/samples/html/virtual/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -256,7 +256,7 @@ $(OBJS)\virtual.exe : $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual.res
@%append $(OBJS)\virtual.lbc option quiet
@%append $(OBJS)\virtual.lbc name $^@
@%append $(OBJS)\virtual.lbc option caseexact
- @%append $(OBJS)\virtual.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\virtual.lbc library %i
@%append $(OBJS)\virtual.lbc option resource=$(OBJS)\virtual_virtual.res
diff --git a/samples/html/virtual/virtual_vc7.vcproj b/samples/html/virtual/virtual_vc7.vcproj
index bd5cc9b0ae..885312a068 100644
--- a/samples/html/virtual/virtual_vc7.vcproj
+++ b/samples/html/virtual/virtual_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\virtual"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\virtual\"
ObjectFile="vc_mswunivudll\virtual\"
ProgramDataBaseFileName="vc_mswunivudll\virtual.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\virtual.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\virtual.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\virtual_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\virtual"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\virtual\"
ObjectFile="vc_mswunivuddll\virtual\"
ProgramDataBaseFileName="vc_mswunivuddll\virtual.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib 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"
OutputFile="vc_mswunivuddll\virtual.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\virtual.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\virtual_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\virtual"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\virtual\"
ObjectFile="vc_mswudll\virtual\"
ProgramDataBaseFileName="vc_mswudll\virtual.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\virtual.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\virtual.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\virtual_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\virtual"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\virtual\"
ObjectFile="vc_mswuddll\virtual\"
ProgramDataBaseFileName="vc_mswuddll\virtual.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib 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"
OutputFile="vc_mswuddll\virtual.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\virtual.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\virtual_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\virtual"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\virtual\"
ObjectFile="vc_mswunivu\virtual\"
ProgramDataBaseFileName="vc_mswunivu\virtual.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\virtual.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\virtual.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\virtual_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\virtual"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\virtual\"
ObjectFile="vc_mswunivud\virtual\"
ProgramDataBaseFileName="vc_mswunivud\virtual.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib 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"
OutputFile="vc_mswunivud\virtual.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\virtual.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\virtual_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\virtual"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\virtual\"
ObjectFile="vc_mswu\virtual\"
ProgramDataBaseFileName="vc_mswu\virtual.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\virtual.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\virtual.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\virtual_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\virtual"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\virtual\"
ObjectFile="vc_mswud\virtual\"
ProgramDataBaseFileName="vc_mswud\virtual.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib 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"
OutputFile="vc_mswud\virtual.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\virtual.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\virtual_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\virtual.cpp"/>
+ RelativePath=".\virtual.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\virtual.rc"/>
+ RelativePath=".\virtual.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/html/virtual/virtual_vc8.vcproj b/samples/html/virtual/virtual_vc8.vcproj
index da9635b8a5..8c94a5d7fd 100644
--- a/samples/html/virtual/virtual_vc8.vcproj
+++ b/samples/html/virtual/virtual_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\virtual\"
ObjectFile="vc_mswunivudll\virtual\"
ProgramDataBaseFileName="vc_mswunivudll\virtual.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\virtual.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\virtual.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\virtual\"
ObjectFile="vc_mswunivuddll\virtual\"
ProgramDataBaseFileName="vc_mswunivuddll\virtual.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib 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"
OutputFile="vc_mswunivuddll\virtual.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\virtual.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\virtual\"
ObjectFile="vc_mswudll\virtual\"
ProgramDataBaseFileName="vc_mswudll\virtual.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\virtual.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\virtual.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\virtual\"
ObjectFile="vc_mswuddll\virtual\"
ProgramDataBaseFileName="vc_mswuddll\virtual.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib 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"
OutputFile="vc_mswuddll\virtual.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\virtual.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\virtual\"
ObjectFile="vc_mswunivu\virtual\"
ProgramDataBaseFileName="vc_mswunivu\virtual.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\virtual.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\virtual.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\virtual\"
ObjectFile="vc_mswunivud\virtual\"
ProgramDataBaseFileName="vc_mswunivud\virtual.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib 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"
OutputFile="vc_mswunivud\virtual.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\virtual.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\virtual\"
ObjectFile="vc_mswu\virtual\"
ProgramDataBaseFileName="vc_mswu\virtual.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\virtual.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\virtual.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\virtual\"
ObjectFile="vc_mswud\virtual\"
ProgramDataBaseFileName="vc_mswud\virtual.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib 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"
OutputFile="vc_mswud\virtual.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\virtual.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\virtual.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\virtual.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/html/widget/Makefile.in b/samples/html/widget/Makefile.in
index d24325c4b2..a206a48f70 100644
--- a/samples/html/widget/Makefile.in
+++ b/samples/html/widget/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -60,7 +60,7 @@ WIDGET_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -114,28 +114,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: widget$(EXEEXT) $(__widget_bundle___depname) data
-install: all
+install:
uninstall:
@@ -151,7 +151,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
widget$(EXEEXT): $(WIDGET_OBJECTS) $(__widget___win32rc)
- $(CXX) -o $@ $(WIDGET_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
+ $(CXX) -o $@ $(WIDGET_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
$(__widget___mac_setfilecmd)
$(__widget___os2_emxbindcmd)
@@ -208,6 +208,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean widget_bundle data
diff --git a/samples/html/widget/makefile.bcc b/samples/html/widget/makefile.bcc
index 18a3aafa22..6adf3c7934 100644
--- a/samples/html/widget/makefile.bcc
+++ b/samples/html/widget/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -233,7 +233,7 @@ clean:
-if exist $(OBJS)\widget.ils del $(OBJS)\widget.ils
$(OBJS)\widget.exe: $(WIDGET_OBJECTS) $(OBJS)\widget_widget.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/html/widget/makefile.gcc b/samples/html/widget/makefile.gcc
index afdf6f1866..f10253642c 100644
--- a/samples/html/widget/makefile.gcc
+++ b/samples/html/widget/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -228,7 +228,7 @@ clean:
-if exist $(OBJS)\widget.exe del $(OBJS)\widget.exe
$(OBJS)\widget.exe: $(WIDGET_OBJECTS) $(OBJS)\widget_widget_rc.o
- $(CXX) -o $@ $(WIDGET_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
data:
if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/html/widget/makefile.unx b/samples/html/widget/makefile.unx
index a42b1ad5c0..bbc1849242 100644
--- a/samples/html/widget/makefile.unx
+++ b/samples/html/widget/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild widget
-install: all
+install:
uninstall:
diff --git a/samples/html/widget/makefile.vc b/samples/html/widget/makefile.vc
index 8db0eee873..2a57fecacb 100644
--- a/samples/html/widget/makefile.vc
+++ b/samples/html/widget/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -309,7 +309,7 @@ clean:
-if exist $(OBJS)\widget.pdb del $(OBJS)\widget.pdb
$(OBJS)\widget.exe: $(WIDGET_OBJECTS) $(OBJS)\widget_widget.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\widget.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\widget.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/html/widget/makefile.wat b/samples/html/widget/makefile.wat
index 8edce2f8dd..9cc153de14 100644
--- a/samples/html/widget/makefile.wat
+++ b/samples/html/widget/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -256,7 +256,7 @@ $(OBJS)\widget.exe : $(WIDGET_OBJECTS) $(OBJS)\widget_widget.res
@%append $(OBJS)\widget.lbc option quiet
@%append $(OBJS)\widget.lbc name $^@
@%append $(OBJS)\widget.lbc option caseexact
- @%append $(OBJS)\widget.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\widget.lbc library %i
@%append $(OBJS)\widget.lbc option resource=$(OBJS)\widget_widget.res
diff --git a/samples/html/widget/widget_vc7.vcproj b/samples/html/widget/widget_vc7.vcproj
index 7ef976ef6e..107e3fd5d3 100644
--- a/samples/html/widget/widget_vc7.vcproj
+++ b/samples/html/widget/widget_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\widget"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\widget\"
ObjectFile="vc_mswunivudll\widget\"
ProgramDataBaseFileName="vc_mswunivudll\widget.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\widget.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\widget.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\widget_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\widget"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\widget\"
ObjectFile="vc_mswunivuddll\widget\"
ProgramDataBaseFileName="vc_mswunivuddll\widget.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib 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"
OutputFile="vc_mswunivuddll\widget.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\widget.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\widget_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\widget"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\widget\"
ObjectFile="vc_mswudll\widget\"
ProgramDataBaseFileName="vc_mswudll\widget.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\widget.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\widget.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\widget_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\widget"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\widget\"
ObjectFile="vc_mswuddll\widget\"
ProgramDataBaseFileName="vc_mswuddll\widget.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib 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"
OutputFile="vc_mswuddll\widget.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\widget.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\widget_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\widget"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\widget\"
ObjectFile="vc_mswunivu\widget\"
ProgramDataBaseFileName="vc_mswunivu\widget.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\widget.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\widget.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\widget_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\widget"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\widget\"
ObjectFile="vc_mswunivud\widget\"
ProgramDataBaseFileName="vc_mswunivud\widget.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib 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"
OutputFile="vc_mswunivud\widget.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\widget.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\widget_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\widget"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\widget\"
ObjectFile="vc_mswu\widget\"
ProgramDataBaseFileName="vc_mswu\widget.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\widget.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\widget.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\widget_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\widget"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\widget\"
ObjectFile="vc_mswud\widget\"
ProgramDataBaseFileName="vc_mswud\widget.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib 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"
OutputFile="vc_mswud\widget.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\widget.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\widget_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\widget.cpp"/>
+ RelativePath=".\widget.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\widget.rc"/>
+ RelativePath=".\widget.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/html/widget/widget_vc8.vcproj b/samples/html/widget/widget_vc8.vcproj
index 3efd9c5607..cb2df7e325 100644
--- a/samples/html/widget/widget_vc8.vcproj
+++ b/samples/html/widget/widget_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\widget\"
ObjectFile="vc_mswunivudll\widget\"
ProgramDataBaseFileName="vc_mswunivudll\widget.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\widget.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\widget.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\widget\"
ObjectFile="vc_mswunivuddll\widget\"
ProgramDataBaseFileName="vc_mswunivuddll\widget.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib 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"
OutputFile="vc_mswunivuddll\widget.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\widget.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\widget\"
ObjectFile="vc_mswudll\widget\"
ProgramDataBaseFileName="vc_mswudll\widget.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\widget.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\widget.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\widget\"
ObjectFile="vc_mswuddll\widget\"
ProgramDataBaseFileName="vc_mswuddll\widget.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib 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"
OutputFile="vc_mswuddll\widget.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\widget.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\widget\"
ObjectFile="vc_mswunivu\widget\"
ProgramDataBaseFileName="vc_mswunivu\widget.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\widget.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\widget.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\widget\"
ObjectFile="vc_mswunivud\widget\"
ProgramDataBaseFileName="vc_mswunivud\widget.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib 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"
OutputFile="vc_mswunivud\widget.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\widget.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\widget\"
ObjectFile="vc_mswu\widget\"
ProgramDataBaseFileName="vc_mswu\widget.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\widget.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\widget.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\widget\"
ObjectFile="vc_mswud\widget\"
ProgramDataBaseFileName="vc_mswud\widget.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib 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"
OutputFile="vc_mswud\widget.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\widget.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\widget.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\widget.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/html/zip/Makefile.in b/samples/html/zip/Makefile.in
index 332f0e9e09..432b9f3fc1 100644
--- a/samples/html/zip/Makefile.in
+++ b/samples/html/zip/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -60,7 +60,7 @@ ZIP_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -114,28 +114,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: zip$(EXEEXT) $(__zip_bundle___depname) data
-install: all
+install:
uninstall:
@@ -151,7 +151,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
zip$(EXEEXT): $(ZIP_OBJECTS) $(__zip___win32rc)
- $(CXX) -o $@ $(ZIP_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
+ $(CXX) -o $@ $(ZIP_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
$(__zip___mac_setfilecmd)
$(__zip___os2_emxbindcmd)
@@ -208,6 +208,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean zip_bundle data
diff --git a/samples/html/zip/makefile.bcc b/samples/html/zip/makefile.bcc
index f68189a984..99f4611c7a 100644
--- a/samples/html/zip/makefile.bcc
+++ b/samples/html/zip/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -233,7 +233,7 @@ clean:
-if exist $(OBJS)\zip.ils del $(OBJS)\zip.ils
$(OBJS)\zip.exe: $(ZIP_OBJECTS) $(OBJS)\zip_zip.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/html/zip/makefile.gcc b/samples/html/zip/makefile.gcc
index 228a038b7d..99f9e98194 100644
--- a/samples/html/zip/makefile.gcc
+++ b/samples/html/zip/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -228,7 +228,7 @@ clean:
-if exist $(OBJS)\zip.exe del $(OBJS)\zip.exe
$(OBJS)\zip.exe: $(ZIP_OBJECTS) $(OBJS)\zip_zip_rc.o
- $(CXX) -o $@ $(ZIP_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
data:
if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/html/zip/makefile.unx b/samples/html/zip/makefile.unx
index 8049b1ee29..9f3ee712d4 100644
--- a/samples/html/zip/makefile.unx
+++ b/samples/html/zip/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild zip
-install: all
+install:
uninstall:
diff --git a/samples/html/zip/makefile.vc b/samples/html/zip/makefile.vc
index 20034e1574..93b8dcf29d 100644
--- a/samples/html/zip/makefile.vc
+++ b/samples/html/zip/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -309,7 +309,7 @@ clean:
-if exist $(OBJS)\zip.pdb del $(OBJS)\zip.pdb
$(OBJS)\zip.exe: $(ZIP_OBJECTS) $(OBJS)\zip_zip.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\zip.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\zip.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/html/zip/makefile.wat b/samples/html/zip/makefile.wat
index 2938e93f00..6f37a205fa 100644
--- a/samples/html/zip/makefile.wat
+++ b/samples/html/zip/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -256,7 +256,7 @@ $(OBJS)\zip.exe : $(ZIP_OBJECTS) $(OBJS)\zip_zip.res
@%append $(OBJS)\zip.lbc option quiet
@%append $(OBJS)\zip.lbc name $^@
@%append $(OBJS)\zip.lbc option caseexact
- @%append $(OBJS)\zip.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\zip.lbc library %i
@%append $(OBJS)\zip.lbc option resource=$(OBJS)\zip_zip.res
diff --git a/samples/html/zip/zip_vc7.vcproj b/samples/html/zip/zip_vc7.vcproj
index 79ac87bb37..c7f04632c3 100644
--- a/samples/html/zip/zip_vc7.vcproj
+++ b/samples/html/zip/zip_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\zip"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\zip\"
ObjectFile="vc_mswunivudll\zip\"
ProgramDataBaseFileName="vc_mswunivudll\zip.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\zip.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\zip.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\zip_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\zip"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\zip\"
ObjectFile="vc_mswunivuddll\zip\"
ProgramDataBaseFileName="vc_mswunivuddll\zip.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib 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"
OutputFile="vc_mswunivuddll\zip.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\zip.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\zip_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\zip"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\zip\"
ObjectFile="vc_mswudll\zip\"
ProgramDataBaseFileName="vc_mswudll\zip.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\zip.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\zip.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\zip_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\zip"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\zip\"
ObjectFile="vc_mswuddll\zip\"
ProgramDataBaseFileName="vc_mswuddll\zip.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib 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"
OutputFile="vc_mswuddll\zip.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\zip.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\zip_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\zip"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\zip\"
ObjectFile="vc_mswunivu\zip\"
ProgramDataBaseFileName="vc_mswunivu\zip.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\zip.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\zip.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\zip_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\zip"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\zip\"
ObjectFile="vc_mswunivud\zip\"
ProgramDataBaseFileName="vc_mswunivud\zip.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib 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"
OutputFile="vc_mswunivud\zip.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\zip.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\zip_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\zip"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\zip\"
ObjectFile="vc_mswu\zip\"
ProgramDataBaseFileName="vc_mswu\zip.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\zip.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\zip.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\zip_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\zip"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\zip\"
ObjectFile="vc_mswud\zip\"
ProgramDataBaseFileName="vc_mswud\zip.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib 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"
OutputFile="vc_mswud\zip.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\zip.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\zip_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\zip.cpp"/>
+ RelativePath=".\zip.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\zip.rc"/>
+ RelativePath=".\zip.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/html/zip/zip_vc8.vcproj b/samples/html/zip/zip_vc8.vcproj
index ee9895220f..1bbc86b6a3 100644
--- a/samples/html/zip/zip_vc8.vcproj
+++ b/samples/html/zip/zip_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\zip\"
ObjectFile="vc_mswunivudll\zip\"
ProgramDataBaseFileName="vc_mswunivudll\zip.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\zip.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\zip.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\zip\"
ObjectFile="vc_mswunivuddll\zip\"
ProgramDataBaseFileName="vc_mswunivuddll\zip.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib 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"
OutputFile="vc_mswunivuddll\zip.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\zip.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\zip\"
ObjectFile="vc_mswudll\zip\"
ProgramDataBaseFileName="vc_mswudll\zip.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\zip.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\zip.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\zip\"
ObjectFile="vc_mswuddll\zip\"
ProgramDataBaseFileName="vc_mswuddll\zip.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib 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"
OutputFile="vc_mswuddll\zip.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\zip.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\zip\"
ObjectFile="vc_mswunivu\zip\"
ProgramDataBaseFileName="vc_mswunivu\zip.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\zip.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\zip.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\zip\"
ObjectFile="vc_mswunivud\zip\"
ProgramDataBaseFileName="vc_mswunivud\zip.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_html.lib 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"
OutputFile="vc_mswunivud\zip.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\zip.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\zip\"
ObjectFile="vc_mswu\zip\"
ProgramDataBaseFileName="vc_mswu\zip.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\zip.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\zip.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\zip\"
ObjectFile="vc_mswud\zip\"
ProgramDataBaseFileName="vc_mswud\zip.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_html.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_html.lib 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"
OutputFile="vc_mswud\zip.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\zip.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\zip.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\zip.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in
index 470b737212..2687071587 100644
--- a/samples/image/Makefile.in
+++ b/samples/image/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ IMAGE_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: image$(EXEEXT) $(__image_bundle___depname) data
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
image$(EXEEXT): $(IMAGE_OBJECTS) $(__image___win32rc)
- $(CXX) -o $@ $(IMAGE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(IMAGE_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)
$(__image___mac_setfilecmd)
$(__image___os2_emxbindcmd)
@@ -204,6 +204,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean image_bundle data
diff --git a/samples/image/image_vc7.vcproj b/samples/image/image_vc7.vcproj
index ed5812c093..d3a74c3c2f 100644
--- a/samples/image/image_vc7.vcproj
+++ b/samples/image/image_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\image"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\image\"
ObjectFile="vc_mswunivudll\image\"
ProgramDataBaseFileName="vc_mswunivudll\image.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\image.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\image.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\image_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\image"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\image\"
ObjectFile="vc_mswunivuddll\image\"
ProgramDataBaseFileName="vc_mswunivuddll\image.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\image.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\image.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\image_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\image"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\image\"
ObjectFile="vc_mswudll\image\"
ProgramDataBaseFileName="vc_mswudll\image.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\image.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\image.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\image_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\image"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\image\"
ObjectFile="vc_mswuddll\image\"
ProgramDataBaseFileName="vc_mswuddll\image.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\image.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\image.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\image_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\image"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\image\"
ObjectFile="vc_mswunivu\image\"
ProgramDataBaseFileName="vc_mswunivu\image.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\image.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\image.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\image_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\image"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\image\"
ObjectFile="vc_mswunivud\image\"
ProgramDataBaseFileName="vc_mswunivud\image.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\image.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\image.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\image_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\image"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\image\"
ObjectFile="vc_mswu\image\"
ProgramDataBaseFileName="vc_mswu\image.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\image.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\image.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\image_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\image"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\image\"
ObjectFile="vc_mswud\image\"
ProgramDataBaseFileName="vc_mswud\image.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\image.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\image.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\image_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\image.cpp"/>
+ RelativePath=".\image.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\image.rc"/>
+ RelativePath=".\image.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/image/image_vc8.vcproj b/samples/image/image_vc8.vcproj
index 31f7153a3b..a3c0d0fca2 100644
--- a/samples/image/image_vc8.vcproj
+++ b/samples/image/image_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\image\"
ObjectFile="vc_mswunivudll\image\"
ProgramDataBaseFileName="vc_mswunivudll\image.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\image.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\image.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\image\"
ObjectFile="vc_mswunivuddll\image\"
ProgramDataBaseFileName="vc_mswunivuddll\image.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\image.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\image.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\image\"
ObjectFile="vc_mswudll\image\"
ProgramDataBaseFileName="vc_mswudll\image.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\image.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\image.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\image\"
ObjectFile="vc_mswuddll\image\"
ProgramDataBaseFileName="vc_mswuddll\image.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\image.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\image.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\image\"
ObjectFile="vc_mswunivu\image\"
ProgramDataBaseFileName="vc_mswunivu\image.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\image.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\image.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\image\"
ObjectFile="vc_mswunivud\image\"
ProgramDataBaseFileName="vc_mswunivud\image.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\image.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\image.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\image\"
ObjectFile="vc_mswu\image\"
ProgramDataBaseFileName="vc_mswu\image.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\image.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\image.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\image\"
ObjectFile="vc_mswud\image\"
ProgramDataBaseFileName="vc_mswud\image.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\image.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\image.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\image.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\image.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/image/makefile.bcc b/samples/image/makefile.bcc
index f8aaa26b41..0bc88c9039 100644
--- a/samples/image/makefile.bcc
+++ b/samples/image/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\image.ils del $(OBJS)\image.ils
$(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_image.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/image/makefile.gcc b/samples/image/makefile.gcc
index ce4339e236..62712744ea 100644
--- a/samples/image/makefile.gcc
+++ b/samples/image/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\image.exe del $(OBJS)\image.exe
$(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_image_rc.o
- $(CXX) -o $@ $(IMAGE_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
data:
if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/image/makefile.unx b/samples/image/makefile.unx
index ec27760bfc..a4d7ac2aad 100644
--- a/samples/image/makefile.unx
+++ b/samples/image/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild image
-install: all
+install:
uninstall:
diff --git a/samples/image/makefile.vc b/samples/image/makefile.vc
index 734acf0c28..3627088007 100644
--- a/samples/image/makefile.vc
+++ b/samples/image/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\image.pdb del $(OBJS)\image.pdb
$(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_image.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\image.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\image.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/image/makefile.wat b/samples/image/makefile.wat
index 849b308fd6..fa019c20f7 100644
--- a/samples/image/makefile.wat
+++ b/samples/image/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\image.exe : $(IMAGE_OBJECTS) $(OBJS)\image_image.res
@%append $(OBJS)\image.lbc option quiet
@%append $(OBJS)\image.lbc name $^@
@%append $(OBJS)\image.lbc option caseexact
- @%append $(OBJS)\image.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\image.lbc library %i
@%append $(OBJS)\image.lbc option resource=$(OBJS)\image_image.res
diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in
index 69253b9e07..c95482c526 100644
--- a/samples/internat/Makefile.in
+++ b/samples/internat/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ INTERNAT_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: internat$(EXEEXT) $(__internat_bundle___depname) ar bg cs de fr ka pl ru sv ja ja_JP.EUC-JP
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
internat$(EXEEXT): $(INTERNAT_OBJECTS) $(__internat___win32rc)
- $(CXX) -o $@ $(INTERNAT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(INTERNAT_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)
$(__internat___mac_setfilecmd)
$(__internat___os2_emxbindcmd)
@@ -324,6 +324,7 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
-.PHONY: all install uninstall clean distclean internat_bundle ar bg cs de fr ka pl ru sv ja ja_JP.EUC-JP
+.PHONY: all install uninstall clean distclean internat_bundle ar bg cs de fr ka pl ru sv \
+ ja ja_JP.EUC-JP
diff --git a/samples/internat/internat_vc7.vcproj b/samples/internat/internat_vc7.vcproj
index 806543b5c7..24bbdcac09 100644
--- a/samples/internat/internat_vc7.vcproj
+++ b/samples/internat/internat_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\internat"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\internat\"
ObjectFile="vc_mswunivudll\internat\"
ProgramDataBaseFileName="vc_mswunivudll\internat.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\internat.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\internat.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\internat_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\internat"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\internat\"
ObjectFile="vc_mswunivuddll\internat\"
ProgramDataBaseFileName="vc_mswunivuddll\internat.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\internat.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\internat.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\internat_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\internat"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\internat\"
ObjectFile="vc_mswudll\internat\"
ProgramDataBaseFileName="vc_mswudll\internat.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\internat.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\internat.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\internat_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\internat"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\internat\"
ObjectFile="vc_mswuddll\internat\"
ProgramDataBaseFileName="vc_mswuddll\internat.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\internat.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\internat.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\internat_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\internat"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\internat\"
ObjectFile="vc_mswunivu\internat\"
ProgramDataBaseFileName="vc_mswunivu\internat.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\internat.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\internat.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\internat_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\internat"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\internat\"
ObjectFile="vc_mswunivud\internat\"
ProgramDataBaseFileName="vc_mswunivud\internat.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\internat.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\internat.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\internat_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\internat"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\internat\"
ObjectFile="vc_mswu\internat\"
ProgramDataBaseFileName="vc_mswu\internat.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\internat.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\internat.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\internat_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\internat"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\internat\"
ObjectFile="vc_mswud\internat\"
ProgramDataBaseFileName="vc_mswud\internat.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\internat.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\internat.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\internat_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\internat.cpp"/>
+ RelativePath=".\internat.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\internat.rc"/>
+ RelativePath=".\internat.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/internat/internat_vc8.vcproj b/samples/internat/internat_vc8.vcproj
index 88a9fe28df..d3c80c9134 100644
--- a/samples/internat/internat_vc8.vcproj
+++ b/samples/internat/internat_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\internat\"
ObjectFile="vc_mswunivudll\internat\"
ProgramDataBaseFileName="vc_mswunivudll\internat.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\internat.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\internat.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\internat\"
ObjectFile="vc_mswunivuddll\internat\"
ProgramDataBaseFileName="vc_mswunivuddll\internat.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\internat.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\internat.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\internat\"
ObjectFile="vc_mswudll\internat\"
ProgramDataBaseFileName="vc_mswudll\internat.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\internat.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\internat.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\internat\"
ObjectFile="vc_mswuddll\internat\"
ProgramDataBaseFileName="vc_mswuddll\internat.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\internat.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\internat.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\internat\"
ObjectFile="vc_mswunivu\internat\"
ProgramDataBaseFileName="vc_mswunivu\internat.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\internat.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\internat.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\internat\"
ObjectFile="vc_mswunivud\internat\"
ProgramDataBaseFileName="vc_mswunivud\internat.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\internat.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\internat.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\internat\"
ObjectFile="vc_mswu\internat\"
ProgramDataBaseFileName="vc_mswu\internat.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\internat.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\internat.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\internat\"
ObjectFile="vc_mswud\internat\"
ProgramDataBaseFileName="vc_mswud\internat.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\internat.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\internat.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\internat.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\internat.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/internat/makefile.bcc b/samples/internat/makefile.bcc
index 899e371a68..263d958658 100644
--- a/samples/internat/makefile.bcc
+++ b/samples/internat/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\internat.ils del $(OBJS)\internat.ils
$(OBJS)\internat.exe: $(INTERNAT_OBJECTS) $(OBJS)\internat_internat.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/internat/makefile.gcc b/samples/internat/makefile.gcc
index 34bcbb072b..5f1dc3df8b 100644
--- a/samples/internat/makefile.gcc
+++ b/samples/internat/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\internat.exe del $(OBJS)\internat.exe
$(OBJS)\internat.exe: $(INTERNAT_OBJECTS) $(OBJS)\internat_internat_rc.o
- $(CXX) -o $@ $(INTERNAT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
ar:
if not exist $(OBJS)\ar mkdir $(OBJS)\ar
diff --git a/samples/internat/makefile.unx b/samples/internat/makefile.unx
index 491fb6935c..fd7716c6e1 100644
--- a/samples/internat/makefile.unx
+++ b/samples/internat/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild internat
-install: all
+install:
uninstall:
diff --git a/samples/internat/makefile.vc b/samples/internat/makefile.vc
index 3a0d141905..fd6c6b08e8 100644
--- a/samples/internat/makefile.vc
+++ b/samples/internat/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\internat.pdb del $(OBJS)\internat.pdb
$(OBJS)\internat.exe: $(INTERNAT_OBJECTS) $(OBJS)\internat_internat.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\internat.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\internat.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/internat/makefile.wat b/samples/internat/makefile.wat
index 022ec9ba10..3e02c0baef 100644
--- a/samples/internat/makefile.wat
+++ b/samples/internat/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\internat.exe : $(INTERNAT_OBJECTS) $(OBJS)\internat_internat.res
@%append $(OBJS)\internat.lbc option quiet
@%append $(OBJS)\internat.lbc name $^@
@%append $(OBJS)\internat.lbc option caseexact
- @%append $(OBJS)\internat.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\internat.lbc library %i
@%append $(OBJS)\internat.lbc option resource=$(OBJS)\internat_internat.res
diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in
index 450324ade0..3b09c513ac 100644
--- a/samples/ipc/Makefile.in
+++ b/samples/ipc/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -79,7 +79,7 @@ BASEIPCSERVER_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -148,15 +148,15 @@ COND_PLATFORM_OS2_1___ipcserver___os2_emxbindcmd = $(NM) ipcserver$(EXEEXT) | \
COND_MONOLITHIC_0___WXLIB_CORE_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
@@ -171,19 +171,19 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: $(__ipcclient___depname) $(__ipcclient_bundle___depname) $(__ipcserver___depname) $(__ipcserver_bundle___depname) baseipcclient$(EXEEXT) baseipcserver$(EXEEXT)
-install: all
+install:
uninstall:
@@ -203,7 +203,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
@COND_USE_GUI_1@ipcclient$(EXEEXT): $(IPCCLIENT_OBJECTS) $(__ipcclient___win32rc)
-@COND_USE_GUI_1@ $(CXX) -o $@ $(IPCCLIENT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_NET_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)
+@COND_USE_GUI_1@ $(CXX) -o $@ $(IPCCLIENT_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_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)
@COND_USE_GUI_1@
@COND_USE_GUI_1@ $(__ipcclient___mac_setfilecmd)
@COND_USE_GUI_1@ $(__ipcclient___os2_emxbindcmd)
@@ -232,7 +232,7 @@ distclean: clean
@COND_PLATFORM_MACOSX_1_USE_GUI_1@ipcclient_bundle: $(____ipcclient_BUNDLE_TGT_REF_DEP)
@COND_USE_GUI_1@ipcserver$(EXEEXT): $(IPCSERVER_OBJECTS) $(__ipcserver___win32rc)
-@COND_USE_GUI_1@ $(CXX) -o $@ $(IPCSERVER_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_NET_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)
+@COND_USE_GUI_1@ $(CXX) -o $@ $(IPCSERVER_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_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)
@COND_USE_GUI_1@
@COND_USE_GUI_1@ $(__ipcserver___mac_setfilecmd)
@COND_USE_GUI_1@ $(__ipcserver___os2_emxbindcmd)
@@ -261,13 +261,13 @@ distclean: clean
@COND_PLATFORM_MACOSX_1_USE_GUI_1@ipcserver_bundle: $(____ipcserver_BUNDLE_TGT_REF_DEP)
baseipcclient$(EXEEXT): $(BASEIPCCLIENT_OBJECTS)
- $(CXX) -o $@ $(BASEIPCCLIENT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+ $(CXX) -o $@ $(BASEIPCCLIENT_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
$(__baseipcclient___mac_setfilecmd)
$(SAMPLES_RPATH_POSTLINK)
baseipcserver$(EXEEXT): $(BASEIPCSERVER_OBJECTS)
- $(CXX) -o $@ $(BASEIPCSERVER_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+ $(CXX) -o $@ $(BASEIPCSERVER_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
$(__baseipcserver___mac_setfilecmd)
$(SAMPLES_RPATH_POSTLINK)
@@ -301,6 +301,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean ipcclient_bundle ipcserver_bundle
diff --git a/samples/ipc/ipc_vc7_baseipcclient.vcproj b/samples/ipc/ipc_vc7_baseipcclient.vcproj
index 5f5df1181c..85d1847beb 100644
--- a/samples/ipc/ipc_vc7_baseipcclient.vcproj
+++ b/samples/ipc/ipc_vc7_baseipcclient.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\baseipcclient"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\baseipcclient\"
ObjectFile="vc_mswunivudll\baseipcclient\"
ProgramDataBaseFileName="vc_mswunivudll\baseipcclient.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\baseipcclient.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\baseipcclient.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\ipc_vc7_baseipcclient.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\baseipcclient"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\baseipcclient\"
ObjectFile="vc_mswunivuddll\baseipcclient\"
ProgramDataBaseFileName="vc_mswunivuddll\baseipcclient.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswunivuddll\baseipcclient.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\baseipcclient.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\ipc_vc7_baseipcclient.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\baseipcclient"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\baseipcclient\"
ObjectFile="vc_mswudll\baseipcclient\"
ProgramDataBaseFileName="vc_mswudll\baseipcclient.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\baseipcclient.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\baseipcclient.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\ipc_vc7_baseipcclient.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\baseipcclient"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\baseipcclient\"
ObjectFile="vc_mswuddll\baseipcclient\"
ProgramDataBaseFileName="vc_mswuddll\baseipcclient.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswuddll\baseipcclient.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\baseipcclient.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\ipc_vc7_baseipcclient.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\baseipcclient"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\baseipcclient\"
ObjectFile="vc_mswunivu\baseipcclient\"
ProgramDataBaseFileName="vc_mswunivu\baseipcclient.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\baseipcclient.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\baseipcclient.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\ipc_vc7_baseipcclient.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\baseipcclient"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\baseipcclient\"
ObjectFile="vc_mswunivud\baseipcclient\"
ProgramDataBaseFileName="vc_mswunivud\baseipcclient.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswunivud\baseipcclient.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\baseipcclient.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\ipc_vc7_baseipcclient.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\baseipcclient"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\baseipcclient\"
ObjectFile="vc_mswu\baseipcclient\"
ProgramDataBaseFileName="vc_mswu\baseipcclient.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\baseipcclient.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\baseipcclient.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\ipc_vc7_baseipcclient.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\baseipcclient"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\baseipcclient\"
ObjectFile="vc_mswud\baseipcclient\"
ProgramDataBaseFileName="vc_mswud\baseipcclient.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswud\baseipcclient.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\baseipcclient.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\ipc_vc7_baseipcclient.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,10 +523,11 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\baseclient.cpp"/>
+ RelativePath=".\baseclient.cpp">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/ipc/ipc_vc7_baseipcserver.vcproj b/samples/ipc/ipc_vc7_baseipcserver.vcproj
index 1f9e1abf8c..07234c542e 100644
--- a/samples/ipc/ipc_vc7_baseipcserver.vcproj
+++ b/samples/ipc/ipc_vc7_baseipcserver.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\baseipcserver"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\baseipcserver\"
ObjectFile="vc_mswunivudll\baseipcserver\"
ProgramDataBaseFileName="vc_mswunivudll\baseipcserver.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\baseipcserver.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\baseipcserver.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\ipc_vc7_baseipcserver.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\baseipcserver"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\baseipcserver\"
ObjectFile="vc_mswunivuddll\baseipcserver\"
ProgramDataBaseFileName="vc_mswunivuddll\baseipcserver.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswunivuddll\baseipcserver.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\baseipcserver.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\ipc_vc7_baseipcserver.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\baseipcserver"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\baseipcserver\"
ObjectFile="vc_mswudll\baseipcserver\"
ProgramDataBaseFileName="vc_mswudll\baseipcserver.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\baseipcserver.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\baseipcserver.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\ipc_vc7_baseipcserver.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\baseipcserver"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\baseipcserver\"
ObjectFile="vc_mswuddll\baseipcserver\"
ProgramDataBaseFileName="vc_mswuddll\baseipcserver.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswuddll\baseipcserver.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\baseipcserver.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\ipc_vc7_baseipcserver.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\baseipcserver"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\baseipcserver\"
ObjectFile="vc_mswunivu\baseipcserver\"
ProgramDataBaseFileName="vc_mswunivu\baseipcserver.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\baseipcserver.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\baseipcserver.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\ipc_vc7_baseipcserver.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\baseipcserver"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\baseipcserver\"
ObjectFile="vc_mswunivud\baseipcserver\"
ProgramDataBaseFileName="vc_mswunivud\baseipcserver.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswunivud\baseipcserver.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\baseipcserver.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\ipc_vc7_baseipcserver.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\baseipcserver"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\baseipcserver\"
ObjectFile="vc_mswu\baseipcserver\"
ProgramDataBaseFileName="vc_mswu\baseipcserver.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\baseipcserver.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\baseipcserver.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\ipc_vc7_baseipcserver.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\baseipcserver"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\baseipcserver\"
ObjectFile="vc_mswud\baseipcserver\"
ProgramDataBaseFileName="vc_mswud\baseipcserver.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswud\baseipcserver.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\baseipcserver.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\ipc_vc7_baseipcserver.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,10 +523,11 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\baseserver.cpp"/>
+ RelativePath=".\baseserver.cpp">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/ipc/ipc_vc7_ipcclient.vcproj b/samples/ipc/ipc_vc7_ipcclient.vcproj
index 27b22a97af..9c90598d23 100644
--- a/samples/ipc/ipc_vc7_ipcclient.vcproj
+++ b/samples/ipc/ipc_vc7_ipcclient.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\ipcclient"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\ipcclient\"
ObjectFile="vc_mswunivudll\ipcclient\"
ProgramDataBaseFileName="vc_mswunivudll\ipcclient.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\ipcclient.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\ipcclient.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\ipc_vc7_ipcclient.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\ipcclient"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\ipcclient\"
ObjectFile="vc_mswunivuddll\ipcclient\"
ProgramDataBaseFileName="vc_mswunivuddll\ipcclient.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswunivuddll\ipcclient.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\ipcclient.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\ipc_vc7_ipcclient.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\ipcclient"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\ipcclient\"
ObjectFile="vc_mswudll\ipcclient\"
ProgramDataBaseFileName="vc_mswudll\ipcclient.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\ipcclient.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\ipcclient.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\ipc_vc7_ipcclient.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\ipcclient"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\ipcclient\"
ObjectFile="vc_mswuddll\ipcclient\"
ProgramDataBaseFileName="vc_mswuddll\ipcclient.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswuddll\ipcclient.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\ipcclient.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\ipc_vc7_ipcclient.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\ipcclient"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\ipcclient\"
ObjectFile="vc_mswunivu\ipcclient\"
ProgramDataBaseFileName="vc_mswunivu\ipcclient.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\ipcclient.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\ipcclient.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\ipc_vc7_ipcclient.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\ipcclient"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\ipcclient\"
ObjectFile="vc_mswunivud\ipcclient\"
ProgramDataBaseFileName="vc_mswunivud\ipcclient.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswunivud\ipcclient.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\ipcclient.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\ipc_vc7_ipcclient.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\ipcclient"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\ipcclient\"
ObjectFile="vc_mswu\ipcclient\"
ProgramDataBaseFileName="vc_mswu\ipcclient.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\ipcclient.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\ipcclient.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\ipc_vc7_ipcclient.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\ipcclient"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\ipcclient\"
ObjectFile="vc_mswud\ipcclient\"
ProgramDataBaseFileName="vc_mswud\ipcclient.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswud\ipcclient.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\ipcclient.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\ipc_vc7_ipcclient.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\client.cpp"/>
+ RelativePath=".\client.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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"/>
+ RelativePath=".\..\..\samples\sample.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/ipc/ipc_vc7_ipcserver.vcproj b/samples/ipc/ipc_vc7_ipcserver.vcproj
index 0592f29dac..efee017fe7 100644
--- a/samples/ipc/ipc_vc7_ipcserver.vcproj
+++ b/samples/ipc/ipc_vc7_ipcserver.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\ipcserver"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\ipcserver\"
ObjectFile="vc_mswunivudll\ipcserver\"
ProgramDataBaseFileName="vc_mswunivudll\ipcserver.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\ipcserver.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\ipcserver.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\ipc_vc7_ipcserver.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\ipcserver"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\ipcserver\"
ObjectFile="vc_mswunivuddll\ipcserver\"
ProgramDataBaseFileName="vc_mswunivuddll\ipcserver.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswunivuddll\ipcserver.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\ipcserver.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\ipc_vc7_ipcserver.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\ipcserver"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\ipcserver\"
ObjectFile="vc_mswudll\ipcserver\"
ProgramDataBaseFileName="vc_mswudll\ipcserver.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\ipcserver.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\ipcserver.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\ipc_vc7_ipcserver.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\ipcserver"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\ipcserver\"
ObjectFile="vc_mswuddll\ipcserver\"
ProgramDataBaseFileName="vc_mswuddll\ipcserver.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswuddll\ipcserver.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\ipcserver.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\ipc_vc7_ipcserver.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\ipcserver"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\ipcserver\"
ObjectFile="vc_mswunivu\ipcserver\"
ProgramDataBaseFileName="vc_mswunivu\ipcserver.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\ipcserver.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\ipcserver.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\ipc_vc7_ipcserver.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\ipcserver"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\ipcserver\"
ObjectFile="vc_mswunivud\ipcserver\"
ProgramDataBaseFileName="vc_mswunivud\ipcserver.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswunivud\ipcserver.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\ipcserver.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\ipc_vc7_ipcserver.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\ipcserver"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\ipcserver\"
ObjectFile="vc_mswu\ipcserver\"
ProgramDataBaseFileName="vc_mswu\ipcserver.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\ipcserver.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\ipcserver.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\ipc_vc7_ipcserver.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\ipcserver"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\ipcserver\"
ObjectFile="vc_mswud\ipcserver\"
ProgramDataBaseFileName="vc_mswud\ipcserver.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswud\ipcserver.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\ipcserver.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\ipc_vc7_ipcserver.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\server.cpp"/>
+ RelativePath=".\server.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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"/>
+ RelativePath=".\..\..\samples\sample.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/ipc/ipc_vc8_baseipcclient.vcproj b/samples/ipc/ipc_vc8_baseipcclient.vcproj
index 84802672c3..60cde73107 100644
--- a/samples/ipc/ipc_vc8_baseipcclient.vcproj
+++ b/samples/ipc/ipc_vc8_baseipcclient.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\baseipcclient\"
ObjectFile="vc_mswunivudll\baseipcclient\"
ProgramDataBaseFileName="vc_mswunivudll\baseipcclient.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\baseipcclient.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\baseipcclient.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\baseipcclient\"
ObjectFile="vc_mswunivuddll\baseipcclient\"
ProgramDataBaseFileName="vc_mswunivuddll\baseipcclient.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswunivuddll\baseipcclient.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\baseipcclient.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\baseipcclient\"
ObjectFile="vc_mswudll\baseipcclient\"
ProgramDataBaseFileName="vc_mswudll\baseipcclient.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\baseipcclient.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\baseipcclient.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\baseipcclient\"
ObjectFile="vc_mswuddll\baseipcclient\"
ProgramDataBaseFileName="vc_mswuddll\baseipcclient.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswuddll\baseipcclient.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\baseipcclient.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\baseipcclient\"
ObjectFile="vc_mswunivu\baseipcclient\"
ProgramDataBaseFileName="vc_mswunivu\baseipcclient.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\baseipcclient.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\baseipcclient.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\baseipcclient\"
ObjectFile="vc_mswunivud\baseipcclient\"
ProgramDataBaseFileName="vc_mswunivud\baseipcclient.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswunivud\baseipcclient.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\baseipcclient.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\baseipcclient\"
ObjectFile="vc_mswu\baseipcclient\"
ProgramDataBaseFileName="vc_mswu\baseipcclient.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\baseipcclient.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\baseipcclient.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\baseipcclient\"
ObjectFile="vc_mswud\baseipcclient\"
ProgramDataBaseFileName="vc_mswud\baseipcclient.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswud\baseipcclient.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\baseipcclient.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,12 +784,13 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\baseclient.cpp"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/ipc/ipc_vc8_baseipcserver.vcproj b/samples/ipc/ipc_vc8_baseipcserver.vcproj
index 66baf4e3ea..72b39947a8 100644
--- a/samples/ipc/ipc_vc8_baseipcserver.vcproj
+++ b/samples/ipc/ipc_vc8_baseipcserver.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\baseipcserver\"
ObjectFile="vc_mswunivudll\baseipcserver\"
ProgramDataBaseFileName="vc_mswunivudll\baseipcserver.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\baseipcserver.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\baseipcserver.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\baseipcserver\"
ObjectFile="vc_mswunivuddll\baseipcserver\"
ProgramDataBaseFileName="vc_mswunivuddll\baseipcserver.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswunivuddll\baseipcserver.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\baseipcserver.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\baseipcserver\"
ObjectFile="vc_mswudll\baseipcserver\"
ProgramDataBaseFileName="vc_mswudll\baseipcserver.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\baseipcserver.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\baseipcserver.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\baseipcserver\"
ObjectFile="vc_mswuddll\baseipcserver\"
ProgramDataBaseFileName="vc_mswuddll\baseipcserver.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswuddll\baseipcserver.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\baseipcserver.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\baseipcserver\"
ObjectFile="vc_mswunivu\baseipcserver\"
ProgramDataBaseFileName="vc_mswunivu\baseipcserver.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\baseipcserver.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\baseipcserver.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\baseipcserver\"
ObjectFile="vc_mswunivud\baseipcserver\"
ProgramDataBaseFileName="vc_mswunivud\baseipcserver.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswunivud\baseipcserver.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\baseipcserver.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\baseipcserver\"
ObjectFile="vc_mswu\baseipcserver\"
ProgramDataBaseFileName="vc_mswu\baseipcserver.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\baseipcserver.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\baseipcserver.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\baseipcserver\"
ObjectFile="vc_mswud\baseipcserver\"
ProgramDataBaseFileName="vc_mswud\baseipcserver.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswud\baseipcserver.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\baseipcserver.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,12 +784,13 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\baseserver.cpp"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/ipc/ipc_vc8_ipcclient.vcproj b/samples/ipc/ipc_vc8_ipcclient.vcproj
index ab08a6dd47..5aa9484727 100644
--- a/samples/ipc/ipc_vc8_ipcclient.vcproj
+++ b/samples/ipc/ipc_vc8_ipcclient.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\ipcclient\"
ObjectFile="vc_mswunivudll\ipcclient\"
ProgramDataBaseFileName="vc_mswunivudll\ipcclient.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\ipcclient.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\ipcclient.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\ipcclient\"
ObjectFile="vc_mswunivuddll\ipcclient\"
ProgramDataBaseFileName="vc_mswunivuddll\ipcclient.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswunivuddll\ipcclient.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\ipcclient.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\ipcclient\"
ObjectFile="vc_mswudll\ipcclient\"
ProgramDataBaseFileName="vc_mswudll\ipcclient.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\ipcclient.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\ipcclient.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\ipcclient\"
ObjectFile="vc_mswuddll\ipcclient\"
ProgramDataBaseFileName="vc_mswuddll\ipcclient.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswuddll\ipcclient.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\ipcclient.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\ipcclient\"
ObjectFile="vc_mswunivu\ipcclient\"
ProgramDataBaseFileName="vc_mswunivu\ipcclient.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\ipcclient.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\ipcclient.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\ipcclient\"
ObjectFile="vc_mswunivud\ipcclient\"
ProgramDataBaseFileName="vc_mswunivud\ipcclient.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswunivud\ipcclient.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\ipcclient.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\ipcclient\"
ObjectFile="vc_mswu\ipcclient\"
ProgramDataBaseFileName="vc_mswu\ipcclient.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\ipcclient.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\ipcclient.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\ipcclient\"
ObjectFile="vc_mswud\ipcclient\"
ProgramDataBaseFileName="vc_mswud\ipcclient.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswud\ipcclient.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\ipcclient.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\client.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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>
diff --git a/samples/ipc/ipc_vc8_ipcserver.vcproj b/samples/ipc/ipc_vc8_ipcserver.vcproj
index 52f691b8d8..16c690bbbb 100644
--- a/samples/ipc/ipc_vc8_ipcserver.vcproj
+++ b/samples/ipc/ipc_vc8_ipcserver.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\ipcserver\"
ObjectFile="vc_mswunivudll\ipcserver\"
ProgramDataBaseFileName="vc_mswunivudll\ipcserver.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\ipcserver.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\ipcserver.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\ipcserver\"
ObjectFile="vc_mswunivuddll\ipcserver\"
ProgramDataBaseFileName="vc_mswunivuddll\ipcserver.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswunivuddll\ipcserver.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\ipcserver.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\ipcserver\"
ObjectFile="vc_mswudll\ipcserver\"
ProgramDataBaseFileName="vc_mswudll\ipcserver.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\ipcserver.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\ipcserver.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\ipcserver\"
ObjectFile="vc_mswuddll\ipcserver\"
ProgramDataBaseFileName="vc_mswuddll\ipcserver.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswuddll\ipcserver.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\ipcserver.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\ipcserver\"
ObjectFile="vc_mswunivu\ipcserver\"
ProgramDataBaseFileName="vc_mswunivu\ipcserver.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\ipcserver.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\ipcserver.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\ipcserver\"
ObjectFile="vc_mswunivud\ipcserver\"
ProgramDataBaseFileName="vc_mswunivud\ipcserver.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswunivud\ipcserver.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\ipcserver.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\ipcserver\"
ObjectFile="vc_mswu\ipcserver\"
ProgramDataBaseFileName="vc_mswu\ipcserver.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\ipcserver.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\ipcserver.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\ipcserver\"
ObjectFile="vc_mswud\ipcserver\"
ProgramDataBaseFileName="vc_mswud\ipcserver.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswud\ipcserver.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\ipcserver.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\server.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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>
diff --git a/samples/ipc/makefile.bcc b/samples/ipc/makefile.bcc
index 819e51f050..b6f7e4a476 100644
--- a/samples/ipc/makefile.bcc
+++ b/samples/ipc/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -282,25 +282,25 @@ clean:
!if "$(USE_GUI)" == "1"
$(OBJS)\ipcclient.exe: $(IPCCLIENT_OBJECTS) $(OBJS)\ipcclient_sample.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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 $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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 $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap @&&|
+ 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 $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap @&&|
+ 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,,
|
diff --git a/samples/ipc/makefile.gcc b/samples/ipc/makefile.gcc
index 09ee006fcd..7ad92239d0 100644
--- a/samples/ipc/makefile.gcc
+++ b/samples/ipc/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -266,19 +266,19 @@ clean:
ifeq ($(USE_GUI),1)
$(OBJS)\ipcclient.exe: $(IPCCLIENT_OBJECTS) $(OBJS)\ipcclient_sample_rc.o
- $(CXX) -o $@ $(IPCCLIENT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
endif
ifeq ($(USE_GUI),1)
$(OBJS)\ipcserver.exe: $(IPCSERVER_OBJECTS) $(OBJS)\ipcserver_sample_rc.o
- $(CXX) -o $@ $(IPCSERVER_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
endif
$(OBJS)\baseipcclient.exe: $(BASEIPCCLIENT_OBJECTS)
- $(CXX) -o $@ $(BASEIPCCLIENT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(__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
+ $(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
$(OBJS)\baseipcserver.exe: $(BASEIPCSERVER_OBJECTS)
- $(CXX) -o $@ $(BASEIPCSERVER_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(__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
+ $(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
$(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
diff --git a/samples/ipc/makefile.unx b/samples/ipc/makefile.unx
index 2469b1a5a4..eb4785c7ca 100644
--- a/samples/ipc/makefile.unx
+++ b/samples/ipc/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -97,7 +97,7 @@ endif
all: test_for_selected_wxbuild ipcclient ipcserver baseipcclient baseipcserver
-install: all
+install:
uninstall:
diff --git a/samples/ipc/makefile.vc b/samples/ipc/makefile.vc
index 3b3b05519e..e560880c19 100644
--- a/samples/ipc/makefile.vc
+++ b/samples/ipc/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -83,18 +83,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -104,18 +104,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -374,25 +374,25 @@ clean:
!if "$(USE_GUI)" == "1"
$(OBJS)\ipcclient.exe: $(IPCCLIENT_OBJECTS) $(OBJS)\ipcclient_sample.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_3) /pdb:"$(OBJS)\ipcclient.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_3) /pdb:"$(OBJS)\ipcclient.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\ipcserver.exe: $(IPCSERVER_OBJECTS) $(OBJS)\ipcserver_sample.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_3) /pdb:"$(OBJS)\ipcserver.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_3) /pdb:"$(OBJS)\ipcserver.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
!endif
$(OBJS)\baseipcclient.exe: $(BASEIPCCLIENT_OBJECTS)
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_3) /pdb:"$(OBJS)\baseipcclient.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_3) /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
<<
$(OBJS)\baseipcserver.exe: $(BASEIPCSERVER_OBJECTS)
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_3) /pdb:"$(OBJS)\baseipcserver.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_3) /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
<<
diff --git a/samples/ipc/makefile.wat b/samples/ipc/makefile.wat
index 48d8149418..44e09bb453 100644
--- a/samples/ipc/makefile.wat
+++ b/samples/ipc/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -293,7 +293,7 @@ $(OBJS)\ipcclient.exe : $(IPCCLIENT_OBJECTS) $(OBJS)\ipcclient_sample.res
@%append $(OBJS)\ipcclient.lbc option quiet
@%append $(OBJS)\ipcclient.lbc name $^@
@%append $(OBJS)\ipcclient.lbc option caseexact
- @%append $(OBJS)\ipcclient.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\ipcclient.lbc library %i
@%append $(OBJS)\ipcclient.lbc option resource=$(OBJS)\ipcclient_sample.res
@@ -307,7 +307,7 @@ $(OBJS)\ipcserver.exe : $(IPCSERVER_OBJECTS) $(OBJS)\ipcserver_sample.res
@%append $(OBJS)\ipcserver.lbc option quiet
@%append $(OBJS)\ipcserver.lbc name $^@
@%append $(OBJS)\ipcserver.lbc option caseexact
- @%append $(OBJS)\ipcserver.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\ipcserver.lbc library %i
@%append $(OBJS)\ipcserver.lbc option resource=$(OBJS)\ipcserver_sample.res
@@ -320,7 +320,7 @@ $(OBJS)\baseipcclient.exe : $(BASEIPCCLIENT_OBJECTS)
@%append $(OBJS)\baseipcclient.lbc option quiet
@%append $(OBJS)\baseipcclient.lbc name $^@
@%append $(OBJS)\baseipcclient.lbc option caseexact
- @%append $(OBJS)\baseipcclient.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt ref 'main_'
+ @%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) do @%append $(OBJS)\baseipcclient.lbc library %i
@%append $(OBJS)\baseipcclient.lbc
@@ -332,7 +332,7 @@ $(OBJS)\baseipcserver.exe : $(BASEIPCSERVER_OBJECTS)
@%append $(OBJS)\baseipcserver.lbc option quiet
@%append $(OBJS)\baseipcserver.lbc name $^@
@%append $(OBJS)\baseipcserver.lbc option caseexact
- @%append $(OBJS)\baseipcserver.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt ref 'main_'
+ @%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) do @%append $(OBJS)\baseipcserver.lbc library %i
@%append $(OBJS)\baseipcserver.lbc
diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in
index 032056cb7a..37b859628a 100644
--- a/samples/joytest/Makefile.in
+++ b/samples/joytest/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -61,7 +61,7 @@ JOYTEST_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -115,28 +115,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: joytest$(EXEEXT) $(__joytest_bundle___depname)
-install: all
+install:
uninstall:
@@ -152,7 +152,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
joytest$(EXEEXT): $(JOYTEST_OBJECTS) $(__joytest___win32rc)
- $(CXX) -o $@ $(JOYTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
+ $(CXX) -o $@ $(JOYTEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
$(__joytest___mac_setfilecmd)
$(__joytest___os2_emxbindcmd)
@@ -197,6 +197,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean joytest_bundle
diff --git a/samples/joytest/joytest_vc7.vcproj b/samples/joytest/joytest_vc7.vcproj
index 633a43fd9c..eecf0cfcf1 100644
--- a/samples/joytest/joytest_vc7.vcproj
+++ b/samples/joytest/joytest_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\joytest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\joytest\"
ObjectFile="vc_mswunivudll\joytest\"
ProgramDataBaseFileName="vc_mswunivudll\joytest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\joytest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\joytest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\joytest_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\joytest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\joytest\"
ObjectFile="vc_mswunivuddll\joytest\"
ProgramDataBaseFileName="vc_mswunivuddll\joytest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivuddll\joytest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\joytest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\joytest_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\joytest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\joytest\"
ObjectFile="vc_mswudll\joytest\"
ProgramDataBaseFileName="vc_mswudll\joytest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\joytest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\joytest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\joytest_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\joytest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\joytest\"
ObjectFile="vc_mswuddll\joytest\"
ProgramDataBaseFileName="vc_mswuddll\joytest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswuddll\joytest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\joytest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\joytest_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\joytest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\joytest\"
ObjectFile="vc_mswunivu\joytest\"
ProgramDataBaseFileName="vc_mswunivu\joytest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\joytest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\joytest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\joytest_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\joytest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\joytest\"
ObjectFile="vc_mswunivud\joytest\"
ProgramDataBaseFileName="vc_mswunivud\joytest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivud\joytest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\joytest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\joytest_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\joytest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\joytest\"
ObjectFile="vc_mswu\joytest\"
ProgramDataBaseFileName="vc_mswu\joytest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\joytest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\joytest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\joytest_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\joytest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\joytest\"
ObjectFile="vc_mswud\joytest\"
ProgramDataBaseFileName="vc_mswud\joytest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswud\joytest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\joytest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\joytest_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\joytest.cpp"/>
+ RelativePath=".\joytest.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\joytest.rc"/>
+ RelativePath=".\joytest.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/joytest/joytest_vc8.vcproj b/samples/joytest/joytest_vc8.vcproj
index 5e0bbccf0b..c0736a3e6d 100644
--- a/samples/joytest/joytest_vc8.vcproj
+++ b/samples/joytest/joytest_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\joytest\"
ObjectFile="vc_mswunivudll\joytest\"
ProgramDataBaseFileName="vc_mswunivudll\joytest.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\joytest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\joytest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\joytest\"
ObjectFile="vc_mswunivuddll\joytest\"
ProgramDataBaseFileName="vc_mswunivuddll\joytest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivuddll\joytest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\joytest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\joytest\"
ObjectFile="vc_mswudll\joytest\"
ProgramDataBaseFileName="vc_mswudll\joytest.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\joytest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\joytest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\joytest\"
ObjectFile="vc_mswuddll\joytest\"
ProgramDataBaseFileName="vc_mswuddll\joytest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswuddll\joytest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\joytest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\joytest\"
ObjectFile="vc_mswunivu\joytest\"
ProgramDataBaseFileName="vc_mswunivu\joytest.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\joytest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\joytest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\joytest\"
ObjectFile="vc_mswunivud\joytest\"
ProgramDataBaseFileName="vc_mswunivud\joytest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivud\joytest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\joytest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\joytest\"
ObjectFile="vc_mswu\joytest\"
ProgramDataBaseFileName="vc_mswu\joytest.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\joytest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\joytest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\joytest\"
ObjectFile="vc_mswud\joytest\"
ProgramDataBaseFileName="vc_mswud\joytest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswud\joytest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\joytest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\joytest.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\joytest.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/joytest/makefile.bcc b/samples/joytest/makefile.bcc
index 341e0707a0..7a10d6f140 100644
--- a/samples/joytest/makefile.bcc
+++ b/samples/joytest/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -233,7 +233,7 @@ clean:
-if exist $(OBJS)\joytest.ils del $(OBJS)\joytest.ils
$(OBJS)\joytest.exe: $(JOYTEST_OBJECTS) $(OBJS)\joytest_joytest.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/joytest/makefile.gcc b/samples/joytest/makefile.gcc
index 3703168a78..7e50946a8b 100644
--- a/samples/joytest/makefile.gcc
+++ b/samples/joytest/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -228,7 +228,7 @@ clean:
-if exist $(OBJS)\joytest.exe del $(OBJS)\joytest.exe
$(OBJS)\joytest.exe: $(JOYTEST_OBJECTS) $(OBJS)\joytest_joytest_rc.o
- $(CXX) -o $@ $(JOYTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(OBJS)\joytest_joytest.o: ./joytest.cpp
$(CXX) -c -o $@ $(JOYTEST_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/joytest/makefile.unx b/samples/joytest/makefile.unx
index 19fd05520b..be3cb24347 100644
--- a/samples/joytest/makefile.unx
+++ b/samples/joytest/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild joytest
-install: all
+install:
uninstall:
diff --git a/samples/joytest/makefile.vc b/samples/joytest/makefile.vc
index e3188e1f85..f0f539fbf1 100644
--- a/samples/joytest/makefile.vc
+++ b/samples/joytest/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -309,7 +309,7 @@ clean:
-if exist $(OBJS)\joytest.pdb del $(OBJS)\joytest.pdb
$(OBJS)\joytest.exe: $(JOYTEST_OBJECTS) $(OBJS)\joytest_joytest.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\joytest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\joytest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/joytest/makefile.wat b/samples/joytest/makefile.wat
index 59d07a8f8e..15f77611ec 100644
--- a/samples/joytest/makefile.wat
+++ b/samples/joytest/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -256,7 +256,7 @@ $(OBJS)\joytest.exe : $(JOYTEST_OBJECTS) $(OBJS)\joytest_joytest.res
@%append $(OBJS)\joytest.lbc option quiet
@%append $(OBJS)\joytest.lbc name $^@
@%append $(OBJS)\joytest.lbc option caseexact
- @%append $(OBJS)\joytest.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\joytest.lbc library %i
@%append $(OBJS)\joytest.lbc option resource=$(OBJS)\joytest_joytest.res
diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in
index a02d035b32..acc433df9a 100644
--- a/samples/keyboard/Makefile.in
+++ b/samples/keyboard/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ KEYBOARD_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: keyboard$(EXEEXT) $(__keyboard_bundle___depname)
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
keyboard$(EXEEXT): $(KEYBOARD_OBJECTS) $(__keyboard___win32rc)
- $(CXX) -o $@ $(KEYBOARD_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(KEYBOARD_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)
$(__keyboard___mac_setfilecmd)
$(__keyboard___os2_emxbindcmd)
@@ -192,6 +192,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean keyboard_bundle
diff --git a/samples/keyboard/keyboard_vc7.vcproj b/samples/keyboard/keyboard_vc7.vcproj
index 0e8c4a171d..657cb275ae 100644
--- a/samples/keyboard/keyboard_vc7.vcproj
+++ b/samples/keyboard/keyboard_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\keyboard"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\keyboard\"
ObjectFile="vc_mswunivudll\keyboard\"
ProgramDataBaseFileName="vc_mswunivudll\keyboard.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\keyboard.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\keyboard.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\keyboard_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\keyboard"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\keyboard\"
ObjectFile="vc_mswunivuddll\keyboard\"
ProgramDataBaseFileName="vc_mswunivuddll\keyboard.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\keyboard.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\keyboard.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\keyboard_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\keyboard"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\keyboard\"
ObjectFile="vc_mswudll\keyboard\"
ProgramDataBaseFileName="vc_mswudll\keyboard.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\keyboard.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\keyboard.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\keyboard_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\keyboard"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\keyboard\"
ObjectFile="vc_mswuddll\keyboard\"
ProgramDataBaseFileName="vc_mswuddll\keyboard.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\keyboard.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\keyboard.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\keyboard_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\keyboard"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\keyboard\"
ObjectFile="vc_mswunivu\keyboard\"
ProgramDataBaseFileName="vc_mswunivu\keyboard.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\keyboard.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\keyboard.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\keyboard_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\keyboard"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\keyboard\"
ObjectFile="vc_mswunivud\keyboard\"
ProgramDataBaseFileName="vc_mswunivud\keyboard.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\keyboard.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\keyboard.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\keyboard_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\keyboard"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\keyboard\"
ObjectFile="vc_mswu\keyboard\"
ProgramDataBaseFileName="vc_mswu\keyboard.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\keyboard.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\keyboard.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\keyboard_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\keyboard"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\keyboard\"
ObjectFile="vc_mswud\keyboard\"
ProgramDataBaseFileName="vc_mswud\keyboard.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\keyboard.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\keyboard.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\keyboard_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\keyboard.cpp"/>
+ RelativePath=".\keyboard.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\keyboard.rc"/>
+ RelativePath=".\keyboard.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/keyboard/keyboard_vc8.vcproj b/samples/keyboard/keyboard_vc8.vcproj
index 5e50b40011..74a657a28b 100644
--- a/samples/keyboard/keyboard_vc8.vcproj
+++ b/samples/keyboard/keyboard_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\keyboard\"
ObjectFile="vc_mswunivudll\keyboard\"
ProgramDataBaseFileName="vc_mswunivudll\keyboard.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\keyboard.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\keyboard.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\keyboard\"
ObjectFile="vc_mswunivuddll\keyboard\"
ProgramDataBaseFileName="vc_mswunivuddll\keyboard.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\keyboard.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\keyboard.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\keyboard\"
ObjectFile="vc_mswudll\keyboard\"
ProgramDataBaseFileName="vc_mswudll\keyboard.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\keyboard.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\keyboard.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\keyboard\"
ObjectFile="vc_mswuddll\keyboard\"
ProgramDataBaseFileName="vc_mswuddll\keyboard.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\keyboard.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\keyboard.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\keyboard\"
ObjectFile="vc_mswunivu\keyboard\"
ProgramDataBaseFileName="vc_mswunivu\keyboard.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\keyboard.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\keyboard.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\keyboard\"
ObjectFile="vc_mswunivud\keyboard\"
ProgramDataBaseFileName="vc_mswunivud\keyboard.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\keyboard.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\keyboard.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\keyboard\"
ObjectFile="vc_mswu\keyboard\"
ProgramDataBaseFileName="vc_mswu\keyboard.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\keyboard.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\keyboard.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\keyboard\"
ObjectFile="vc_mswud\keyboard\"
ProgramDataBaseFileName="vc_mswud\keyboard.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\keyboard.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\keyboard.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\keyboard.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\keyboard.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/keyboard/makefile.bcc b/samples/keyboard/makefile.bcc
index 728873703d..b0f7902ab6 100644
--- a/samples/keyboard/makefile.bcc
+++ b/samples/keyboard/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\keyboard.ils del $(OBJS)\keyboard.ils
$(OBJS)\keyboard.exe: $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_keyboard.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/keyboard/makefile.gcc b/samples/keyboard/makefile.gcc
index 41dd7b0542..199f6d33fe 100644
--- a/samples/keyboard/makefile.gcc
+++ b/samples/keyboard/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\keyboard.exe del $(OBJS)\keyboard.exe
$(OBJS)\keyboard.exe: $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_keyboard_rc.o
- $(CXX) -o $@ $(KEYBOARD_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(OBJS)\keyboard_keyboard.o: ./keyboard.cpp
$(CXX) -c -o $@ $(KEYBOARD_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/keyboard/makefile.unx b/samples/keyboard/makefile.unx
index 71e3f0dec8..46f640dff9 100644
--- a/samples/keyboard/makefile.unx
+++ b/samples/keyboard/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild keyboard
-install: all
+install:
uninstall:
diff --git a/samples/keyboard/makefile.vc b/samples/keyboard/makefile.vc
index 369cd32faa..4f2e1667e1 100644
--- a/samples/keyboard/makefile.vc
+++ b/samples/keyboard/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\keyboard.pdb del $(OBJS)\keyboard.pdb
$(OBJS)\keyboard.exe: $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_keyboard.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\keyboard.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\keyboard.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/keyboard/makefile.wat b/samples/keyboard/makefile.wat
index bd120d862f..8cd5e42806 100644
--- a/samples/keyboard/makefile.wat
+++ b/samples/keyboard/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\keyboard.exe : $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_keyboard.res
@%append $(OBJS)\keyboard.lbc option quiet
@%append $(OBJS)\keyboard.lbc name $^@
@%append $(OBJS)\keyboard.lbc option caseexact
- @%append $(OBJS)\keyboard.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\keyboard.lbc library %i
@%append $(OBJS)\keyboard.lbc option resource=$(OBJS)\keyboard_keyboard.res
diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in
index 560d93fe9b..21fd5bb576 100644
--- a/samples/layout/Makefile.in
+++ b/samples/layout/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ LAYOUT_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: layout$(EXEEXT) $(__layout_bundle___depname)
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
layout$(EXEEXT): $(LAYOUT_OBJECTS) $(__layout___win32rc)
- $(CXX) -o $@ $(LAYOUT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(LAYOUT_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)
$(__layout___mac_setfilecmd)
$(__layout___os2_emxbindcmd)
@@ -192,6 +192,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean layout_bundle
diff --git a/samples/layout/layout_vc7.vcproj b/samples/layout/layout_vc7.vcproj
index b22e2290ed..fe29f13bf8 100644
--- a/samples/layout/layout_vc7.vcproj
+++ b/samples/layout/layout_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\layout"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\layout\"
ObjectFile="vc_mswunivudll\layout\"
ProgramDataBaseFileName="vc_mswunivudll\layout.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\layout.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\layout.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\layout_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\layout"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\layout\"
ObjectFile="vc_mswunivuddll\layout\"
ProgramDataBaseFileName="vc_mswunivuddll\layout.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\layout.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\layout.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\layout_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\layout"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\layout\"
ObjectFile="vc_mswudll\layout\"
ProgramDataBaseFileName="vc_mswudll\layout.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\layout.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\layout.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\layout_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\layout"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\layout\"
ObjectFile="vc_mswuddll\layout\"
ProgramDataBaseFileName="vc_mswuddll\layout.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\layout.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\layout.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\layout_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\layout"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\layout\"
ObjectFile="vc_mswunivu\layout\"
ProgramDataBaseFileName="vc_mswunivu\layout.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\layout.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\layout.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\layout_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\layout"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\layout\"
ObjectFile="vc_mswunivud\layout\"
ProgramDataBaseFileName="vc_mswunivud\layout.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\layout.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\layout.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\layout_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\layout"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\layout\"
ObjectFile="vc_mswu\layout\"
ProgramDataBaseFileName="vc_mswu\layout.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\layout.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\layout.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\layout_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\layout"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\layout\"
ObjectFile="vc_mswud\layout\"
ProgramDataBaseFileName="vc_mswud\layout.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\layout.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\layout.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\layout_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\layout.cpp"/>
+ RelativePath=".\layout.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\layout.rc"/>
+ RelativePath=".\layout.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/layout/layout_vc8.vcproj b/samples/layout/layout_vc8.vcproj
index 021ac85c2a..04354b4e07 100644
--- a/samples/layout/layout_vc8.vcproj
+++ b/samples/layout/layout_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\layout\"
ObjectFile="vc_mswunivudll\layout\"
ProgramDataBaseFileName="vc_mswunivudll\layout.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\layout.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\layout.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\layout\"
ObjectFile="vc_mswunivuddll\layout\"
ProgramDataBaseFileName="vc_mswunivuddll\layout.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\layout.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\layout.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\layout\"
ObjectFile="vc_mswudll\layout\"
ProgramDataBaseFileName="vc_mswudll\layout.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\layout.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\layout.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\layout\"
ObjectFile="vc_mswuddll\layout\"
ProgramDataBaseFileName="vc_mswuddll\layout.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\layout.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\layout.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\layout\"
ObjectFile="vc_mswunivu\layout\"
ProgramDataBaseFileName="vc_mswunivu\layout.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\layout.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\layout.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\layout\"
ObjectFile="vc_mswunivud\layout\"
ProgramDataBaseFileName="vc_mswunivud\layout.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\layout.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\layout.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\layout\"
ObjectFile="vc_mswu\layout\"
ProgramDataBaseFileName="vc_mswu\layout.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\layout.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\layout.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\layout\"
ObjectFile="vc_mswud\layout\"
ProgramDataBaseFileName="vc_mswud\layout.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\layout.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\layout.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\layout.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\layout.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/layout/makefile.bcc b/samples/layout/makefile.bcc
index 427e0496fd..aed57b7cad 100644
--- a/samples/layout/makefile.bcc
+++ b/samples/layout/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\layout.ils del $(OBJS)\layout.ils
$(OBJS)\layout.exe: $(LAYOUT_OBJECTS) $(OBJS)\layout_layout.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/layout/makefile.gcc b/samples/layout/makefile.gcc
index 9b6a3aaaa6..7d32128e68 100644
--- a/samples/layout/makefile.gcc
+++ b/samples/layout/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\layout.exe del $(OBJS)\layout.exe
$(OBJS)\layout.exe: $(LAYOUT_OBJECTS) $(OBJS)\layout_layout_rc.o
- $(CXX) -o $@ $(LAYOUT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(OBJS)\layout_layout.o: ./layout.cpp
$(CXX) -c -o $@ $(LAYOUT_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/layout/makefile.unx b/samples/layout/makefile.unx
index dc84c206ea..b2720a5848 100644
--- a/samples/layout/makefile.unx
+++ b/samples/layout/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild layout
-install: all
+install:
uninstall:
diff --git a/samples/layout/makefile.vc b/samples/layout/makefile.vc
index c14bea3500..2f31e28648 100644
--- a/samples/layout/makefile.vc
+++ b/samples/layout/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\layout.pdb del $(OBJS)\layout.pdb
$(OBJS)\layout.exe: $(LAYOUT_OBJECTS) $(OBJS)\layout_layout.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\layout.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\layout.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/layout/makefile.wat b/samples/layout/makefile.wat
index 9d4e7ec088..544c1862f3 100644
--- a/samples/layout/makefile.wat
+++ b/samples/layout/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\layout.exe : $(LAYOUT_OBJECTS) $(OBJS)\layout_layout.res
@%append $(OBJS)\layout.lbc option quiet
@%append $(OBJS)\layout.lbc name $^@
@%append $(OBJS)\layout.lbc option caseexact
- @%append $(OBJS)\layout.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\layout.lbc library %i
@%append $(OBJS)\layout.lbc option resource=$(OBJS)\layout_layout.res
diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in
index cd23d9270c..3aa0fd9bed 100644
--- a/samples/listctrl/Makefile.in
+++ b/samples/listctrl/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ LISTCTRL_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: listctrl$(EXEEXT) $(__listctrl_bundle___depname)
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
listctrl$(EXEEXT): $(LISTCTRL_OBJECTS) $(__listctrl___win32rc)
- $(CXX) -o $@ $(LISTCTRL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(LISTCTRL_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)
$(__listctrl___mac_setfilecmd)
$(__listctrl___os2_emxbindcmd)
@@ -192,6 +192,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean listctrl_bundle
diff --git a/samples/listctrl/listctrl_vc7.vcproj b/samples/listctrl/listctrl_vc7.vcproj
index 983d963d38..5686fc5d70 100644
--- a/samples/listctrl/listctrl_vc7.vcproj
+++ b/samples/listctrl/listctrl_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\listctrl"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\listctrl\"
ObjectFile="vc_mswunivudll\listctrl\"
ProgramDataBaseFileName="vc_mswunivudll\listctrl.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\listctrl.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\listctrl.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\listctrl_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\listctrl"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\listctrl\"
ObjectFile="vc_mswunivuddll\listctrl\"
ProgramDataBaseFileName="vc_mswunivuddll\listctrl.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\listctrl.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\listctrl.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\listctrl_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\listctrl"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\listctrl\"
ObjectFile="vc_mswudll\listctrl\"
ProgramDataBaseFileName="vc_mswudll\listctrl.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\listctrl.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\listctrl.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\listctrl_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\listctrl"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\listctrl\"
ObjectFile="vc_mswuddll\listctrl\"
ProgramDataBaseFileName="vc_mswuddll\listctrl.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\listctrl.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\listctrl.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\listctrl_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\listctrl"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\listctrl\"
ObjectFile="vc_mswunivu\listctrl\"
ProgramDataBaseFileName="vc_mswunivu\listctrl.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\listctrl.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\listctrl.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\listctrl_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\listctrl"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\listctrl\"
ObjectFile="vc_mswunivud\listctrl\"
ProgramDataBaseFileName="vc_mswunivud\listctrl.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\listctrl.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\listctrl.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\listctrl_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\listctrl"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\listctrl\"
ObjectFile="vc_mswu\listctrl\"
ProgramDataBaseFileName="vc_mswu\listctrl.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\listctrl.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\listctrl.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\listctrl_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\listctrl"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\listctrl\"
ObjectFile="vc_mswud\listctrl\"
ProgramDataBaseFileName="vc_mswud\listctrl.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\listctrl.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\listctrl.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\listctrl_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\listtest.cpp"/>
+ RelativePath=".\listtest.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\listtest.rc"/>
+ RelativePath=".\listtest.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/listctrl/listctrl_vc8.vcproj b/samples/listctrl/listctrl_vc8.vcproj
index f74eee90e9..9693ff5aad 100644
--- a/samples/listctrl/listctrl_vc8.vcproj
+++ b/samples/listctrl/listctrl_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\listctrl\"
ObjectFile="vc_mswunivudll\listctrl\"
ProgramDataBaseFileName="vc_mswunivudll\listctrl.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\listctrl.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\listctrl.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\listctrl\"
ObjectFile="vc_mswunivuddll\listctrl\"
ProgramDataBaseFileName="vc_mswunivuddll\listctrl.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\listctrl.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\listctrl.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\listctrl\"
ObjectFile="vc_mswudll\listctrl\"
ProgramDataBaseFileName="vc_mswudll\listctrl.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\listctrl.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\listctrl.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\listctrl\"
ObjectFile="vc_mswuddll\listctrl\"
ProgramDataBaseFileName="vc_mswuddll\listctrl.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\listctrl.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\listctrl.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\listctrl\"
ObjectFile="vc_mswunivu\listctrl\"
ProgramDataBaseFileName="vc_mswunivu\listctrl.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\listctrl.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\listctrl.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\listctrl\"
ObjectFile="vc_mswunivud\listctrl\"
ProgramDataBaseFileName="vc_mswunivud\listctrl.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\listctrl.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\listctrl.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\listctrl\"
ObjectFile="vc_mswu\listctrl\"
ProgramDataBaseFileName="vc_mswu\listctrl.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\listctrl.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\listctrl.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\listctrl\"
ObjectFile="vc_mswud\listctrl\"
ProgramDataBaseFileName="vc_mswud\listctrl.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\listctrl.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\listctrl.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\listtest.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\listtest.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/listctrl/makefile.bcc b/samples/listctrl/makefile.bcc
index a12c17003c..d1bcd49de5 100644
--- a/samples/listctrl/makefile.bcc
+++ b/samples/listctrl/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\listctrl.ils del $(OBJS)\listctrl.ils
$(OBJS)\listctrl.exe: $(LISTCTRL_OBJECTS) $(OBJS)\listctrl_listtest.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/listctrl/makefile.gcc b/samples/listctrl/makefile.gcc
index ab622bdbe4..26f8a3e0fd 100644
--- a/samples/listctrl/makefile.gcc
+++ b/samples/listctrl/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\listctrl.exe del $(OBJS)\listctrl.exe
$(OBJS)\listctrl.exe: $(LISTCTRL_OBJECTS) $(OBJS)\listctrl_listtest_rc.o
- $(CXX) -o $@ $(LISTCTRL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(OBJS)\listctrl_listtest.o: ./listtest.cpp
$(CXX) -c -o $@ $(LISTCTRL_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/listctrl/makefile.unx b/samples/listctrl/makefile.unx
index 5cdacec921..2c70b7176f 100644
--- a/samples/listctrl/makefile.unx
+++ b/samples/listctrl/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild listctrl
-install: all
+install:
uninstall:
diff --git a/samples/listctrl/makefile.vc b/samples/listctrl/makefile.vc
index 1761ca5937..aa59c30434 100644
--- a/samples/listctrl/makefile.vc
+++ b/samples/listctrl/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\listctrl.pdb del $(OBJS)\listctrl.pdb
$(OBJS)\listctrl.exe: $(LISTCTRL_OBJECTS) $(OBJS)\listctrl_listtest.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\listctrl.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\listctrl.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/listctrl/makefile.wat b/samples/listctrl/makefile.wat
index d25e0ef349..2c34fa9c5a 100644
--- a/samples/listctrl/makefile.wat
+++ b/samples/listctrl/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\listctrl.exe : $(LISTCTRL_OBJECTS) $(OBJS)\listctrl_listtest.res
@%append $(OBJS)\listctrl.lbc option quiet
@%append $(OBJS)\listctrl.lbc name $^@
@%append $(OBJS)\listctrl.lbc option caseexact
- @%append $(OBJS)\listctrl.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\listctrl.lbc library %i
@%append $(OBJS)\listctrl.lbc option resource=$(OBJS)\listctrl_listtest.res
diff --git a/samples/makefile.bcc b/samples/makefile.bcc
index 1806d00a9d..d64a6ae0e9 100644
--- a/samples/makefile.bcc
+++ b/samples/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
diff --git a/samples/makefile.gcc b/samples/makefile.gcc
index 7a0cd93ef1..9fb4596f7b 100644
--- a/samples/makefile.gcc
+++ b/samples/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -337,7 +337,14 @@ mfc:
memcheck:
$(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) all
-.PHONY: all clean access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing propgrid regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer mfc memcheck
+.PHONY: all clean access animate artprov aui calendar caret collpane config combo \
+ console controls dataview dialogs dialup display dnd docview dragimag drawing \
+ erase event exec except font grid help htlbox html image internat ipc joytest \
+ keyboard layout listctrl mdi mediaplayer menu minimal mobile nativdlg notebook \
+ oleauto opengl ownerdrw popup printing propgrid regtest render richtext sashtest \
+ scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text \
+ thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer mfc \
+ memcheck
SHELL := $(COMSPEC)
diff --git a/samples/makefile.vc b/samples/makefile.vc
index c6eb7996bc..0934b292ba 100644
--- a/samples/makefile.vc
+++ b/samples/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
diff --git a/samples/makefile.wat b/samples/makefile.wat
index 2243d08b62..007c747a31 100644
--- a/samples/makefile.wat
+++ b/samples/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in
index 826f50fab6..2bea8a07fa 100644
--- a/samples/mdi/Makefile.in
+++ b/samples/mdi/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ MDI_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: mdi$(EXEEXT) $(__mdi_bundle___depname)
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
mdi$(EXEEXT): $(MDI_OBJECTS) $(__mdi___win32rc)
- $(CXX) -o $@ $(MDI_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(MDI_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)
$(__mdi___mac_setfilecmd)
$(__mdi___os2_emxbindcmd)
@@ -192,6 +192,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean mdi_bundle
diff --git a/samples/mdi/makefile.bcc b/samples/mdi/makefile.bcc
index 436b98dc97..bf7ba03793 100644
--- a/samples/mdi/makefile.bcc
+++ b/samples/mdi/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\mdi.ils del $(OBJS)\mdi.ils
$(OBJS)\mdi.exe: $(MDI_OBJECTS) $(OBJS)\mdi_mdi.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/mdi/makefile.gcc b/samples/mdi/makefile.gcc
index fb65c354f2..2a281d2b91 100644
--- a/samples/mdi/makefile.gcc
+++ b/samples/mdi/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\mdi.exe del $(OBJS)\mdi.exe
$(OBJS)\mdi.exe: $(MDI_OBJECTS) $(OBJS)\mdi_mdi_rc.o
- $(CXX) -o $@ $(MDI_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(OBJS)\mdi_mdi.o: ./mdi.cpp
$(CXX) -c -o $@ $(MDI_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/mdi/makefile.unx b/samples/mdi/makefile.unx
index 0fec4c6731..8b014cdc67 100644
--- a/samples/mdi/makefile.unx
+++ b/samples/mdi/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild mdi
-install: all
+install:
uninstall:
diff --git a/samples/mdi/makefile.vc b/samples/mdi/makefile.vc
index 8f489ce565..20f84886b1 100644
--- a/samples/mdi/makefile.vc
+++ b/samples/mdi/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\mdi.pdb del $(OBJS)\mdi.pdb
$(OBJS)\mdi.exe: $(MDI_OBJECTS) $(OBJS)\mdi_mdi.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\mdi.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\mdi.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/mdi/makefile.wat b/samples/mdi/makefile.wat
index 7897d48801..e23927823e 100644
--- a/samples/mdi/makefile.wat
+++ b/samples/mdi/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\mdi.exe : $(MDI_OBJECTS) $(OBJS)\mdi_mdi.res
@%append $(OBJS)\mdi.lbc option quiet
@%append $(OBJS)\mdi.lbc name $^@
@%append $(OBJS)\mdi.lbc option caseexact
- @%append $(OBJS)\mdi.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\mdi.lbc library %i
@%append $(OBJS)\mdi.lbc option resource=$(OBJS)\mdi_mdi.res
diff --git a/samples/mdi/mdi_vc7.vcproj b/samples/mdi/mdi_vc7.vcproj
index 3fdc4ed316..d7d0a28e74 100644
--- a/samples/mdi/mdi_vc7.vcproj
+++ b/samples/mdi/mdi_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\mdi"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\mdi\"
ObjectFile="vc_mswunivudll\mdi\"
ProgramDataBaseFileName="vc_mswunivudll\mdi.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\mdi.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\mdi.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\mdi_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\mdi"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\mdi\"
ObjectFile="vc_mswunivuddll\mdi\"
ProgramDataBaseFileName="vc_mswunivuddll\mdi.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\mdi.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\mdi.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\mdi_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\mdi"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\mdi\"
ObjectFile="vc_mswudll\mdi\"
ProgramDataBaseFileName="vc_mswudll\mdi.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\mdi.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\mdi.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\mdi_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\mdi"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\mdi\"
ObjectFile="vc_mswuddll\mdi\"
ProgramDataBaseFileName="vc_mswuddll\mdi.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\mdi.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\mdi.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\mdi_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\mdi"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\mdi\"
ObjectFile="vc_mswunivu\mdi\"
ProgramDataBaseFileName="vc_mswunivu\mdi.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\mdi.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\mdi.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\mdi_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\mdi"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\mdi\"
ObjectFile="vc_mswunivud\mdi\"
ProgramDataBaseFileName="vc_mswunivud\mdi.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\mdi.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\mdi.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\mdi_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\mdi"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\mdi\"
ObjectFile="vc_mswu\mdi\"
ProgramDataBaseFileName="vc_mswu\mdi.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\mdi.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\mdi.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\mdi_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\mdi"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\mdi\"
ObjectFile="vc_mswud\mdi\"
ProgramDataBaseFileName="vc_mswud\mdi.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\mdi.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\mdi.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\mdi_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\mdi.cpp"/>
+ RelativePath=".\mdi.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\mdi.rc"/>
+ RelativePath=".\mdi.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/mdi/mdi_vc8.vcproj b/samples/mdi/mdi_vc8.vcproj
index d45260e15b..abe0a77d23 100644
--- a/samples/mdi/mdi_vc8.vcproj
+++ b/samples/mdi/mdi_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\mdi\"
ObjectFile="vc_mswunivudll\mdi\"
ProgramDataBaseFileName="vc_mswunivudll\mdi.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\mdi.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\mdi.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\mdi\"
ObjectFile="vc_mswunivuddll\mdi\"
ProgramDataBaseFileName="vc_mswunivuddll\mdi.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\mdi.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\mdi.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\mdi\"
ObjectFile="vc_mswudll\mdi\"
ProgramDataBaseFileName="vc_mswudll\mdi.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\mdi.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\mdi.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\mdi\"
ObjectFile="vc_mswuddll\mdi\"
ProgramDataBaseFileName="vc_mswuddll\mdi.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\mdi.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\mdi.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\mdi\"
ObjectFile="vc_mswunivu\mdi\"
ProgramDataBaseFileName="vc_mswunivu\mdi.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\mdi.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\mdi.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\mdi\"
ObjectFile="vc_mswunivud\mdi\"
ProgramDataBaseFileName="vc_mswunivud\mdi.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\mdi.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\mdi.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\mdi\"
ObjectFile="vc_mswu\mdi\"
ProgramDataBaseFileName="vc_mswu\mdi.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\mdi.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\mdi.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\mdi\"
ObjectFile="vc_mswud\mdi\"
ProgramDataBaseFileName="vc_mswud\mdi.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\mdi.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\mdi.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\mdi.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\mdi.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/mediaplayer/Makefile.in b/samples/mediaplayer/Makefile.in
index d8583c4fc7..1eefae2750 100644
--- a/samples/mediaplayer/Makefile.in
+++ b/samples/mediaplayer/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -60,7 +60,7 @@ MEDIAPLAYER_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -117,28 +117,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: mediaplayer$(EXEEXT) $(__mediaplayer_bundle___depname)
-install: all
+install:
uninstall:
@@ -154,7 +154,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
mediaplayer$(EXEEXT): $(MEDIAPLAYER_OBJECTS) $(__mediaplayer___win32rc)
- $(CXX) -o $@ $(MEDIAPLAYER_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__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)
+ $(CXX) -o $@ $(MEDIAPLAYER_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__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)
$(__mediaplayer___mac_setfilecmd)
$(__mediaplayer___os2_emxbindcmd)
@@ -199,6 +199,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean mediaplayer_bundle
diff --git a/samples/mediaplayer/makefile.bcc b/samples/mediaplayer/makefile.bcc
index 509bd4b832..6bd2f8d717 100644
--- a/samples/mediaplayer/makefile.bcc
+++ b/samples/mediaplayer/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -233,7 +233,7 @@ clean:
-if exist $(OBJS)\mediaplayer.ils del $(OBJS)\mediaplayer.ils
$(OBJS)\mediaplayer.exe: $(MEDIAPLAYER_OBJECTS) $(OBJS)\mediaplayer_sample.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/mediaplayer/makefile.gcc b/samples/mediaplayer/makefile.gcc
index cccb7d7924..23c4cb04c3 100644
--- a/samples/mediaplayer/makefile.gcc
+++ b/samples/mediaplayer/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -230,7 +230,7 @@ clean:
-if exist $(OBJS)\mediaplayer.exe del $(OBJS)\mediaplayer.exe
$(OBJS)\mediaplayer.exe: $(MEDIAPLAYER_OBJECTS) $(OBJS)\mediaplayer_sample_rc.o
- $(CXX) -o $@ $(MEDIAPLAYER_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(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
diff --git a/samples/mediaplayer/makefile.unx b/samples/mediaplayer/makefile.unx
index 5171233390..88b6a97d68 100644
--- a/samples/mediaplayer/makefile.unx
+++ b/samples/mediaplayer/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild mediaplayer
-install: all
+install:
uninstall:
diff --git a/samples/mediaplayer/makefile.vc b/samples/mediaplayer/makefile.vc
index a441d350a4..c0d1929cff 100644
--- a/samples/mediaplayer/makefile.vc
+++ b/samples/mediaplayer/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -309,7 +309,7 @@ clean:
-if exist $(OBJS)\mediaplayer.pdb del $(OBJS)\mediaplayer.pdb
$(OBJS)\mediaplayer.exe: $(MEDIAPLAYER_OBJECTS) $(OBJS)\mediaplayer_sample.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\mediaplayer.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\mediaplayer.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/mediaplayer/makefile.wat b/samples/mediaplayer/makefile.wat
index bd873dacf6..729f2462fc 100644
--- a/samples/mediaplayer/makefile.wat
+++ b/samples/mediaplayer/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -258,7 +258,7 @@ $(OBJS)\mediaplayer.exe : $(MEDIAPLAYER_OBJECTS) $(OBJS)\mediaplayer_sample.res
@%append $(OBJS)\mediaplayer.lbc option quiet
@%append $(OBJS)\mediaplayer.lbc name $^@
@%append $(OBJS)\mediaplayer.lbc option caseexact
- @%append $(OBJS)\mediaplayer.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\mediaplayer.lbc library %i
@%append $(OBJS)\mediaplayer.lbc option resource=$(OBJS)\mediaplayer_sample.res
diff --git a/samples/mediaplayer/mediaplayer_vc7.vcproj b/samples/mediaplayer/mediaplayer_vc7.vcproj
index a0f8be4fc9..12d039db20 100644
--- a/samples/mediaplayer/mediaplayer_vc7.vcproj
+++ b/samples/mediaplayer/mediaplayer_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\mediaplayer"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\mediaplayer\"
ObjectFile="vc_mswunivudll\mediaplayer\"
ProgramDataBaseFileName="vc_mswunivudll\mediaplayer.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\mediaplayer.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\mediaplayer.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\mediaplayer_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\mediaplayer"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\mediaplayer\"
ObjectFile="vc_mswunivuddll\mediaplayer\"
ProgramDataBaseFileName="vc_mswunivuddll\mediaplayer.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_media.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_media.lib 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"
OutputFile="vc_mswunivuddll\mediaplayer.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\mediaplayer.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\mediaplayer_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\mediaplayer"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\mediaplayer\"
ObjectFile="vc_mswudll\mediaplayer\"
ProgramDataBaseFileName="vc_mswudll\mediaplayer.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\mediaplayer.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\mediaplayer.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\mediaplayer_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\mediaplayer"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\mediaplayer\"
ObjectFile="vc_mswuddll\mediaplayer\"
ProgramDataBaseFileName="vc_mswuddll\mediaplayer.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_media.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_media.lib 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"
OutputFile="vc_mswuddll\mediaplayer.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\mediaplayer.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\mediaplayer_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\mediaplayer"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\mediaplayer\"
ObjectFile="vc_mswunivu\mediaplayer\"
ProgramDataBaseFileName="vc_mswunivu\mediaplayer.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\mediaplayer.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\mediaplayer.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\mediaplayer_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\mediaplayer"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\mediaplayer\"
ObjectFile="vc_mswunivud\mediaplayer\"
ProgramDataBaseFileName="vc_mswunivud\mediaplayer.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_media.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_media.lib 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"
OutputFile="vc_mswunivud\mediaplayer.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\mediaplayer.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\mediaplayer_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\mediaplayer"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\mediaplayer\"
ObjectFile="vc_mswu\mediaplayer\"
ProgramDataBaseFileName="vc_mswu\mediaplayer.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\mediaplayer.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\mediaplayer.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\mediaplayer_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\mediaplayer"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\mediaplayer\"
ObjectFile="vc_mswud\mediaplayer\"
ProgramDataBaseFileName="vc_mswud\mediaplayer.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_media.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_media.lib 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"
OutputFile="vc_mswud\mediaplayer.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\mediaplayer.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\mediaplayer_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\mediaplayer.cpp"/>
+ RelativePath=".\mediaplayer.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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"/>
+ RelativePath=".\..\..\samples\sample.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/mediaplayer/mediaplayer_vc8.vcproj b/samples/mediaplayer/mediaplayer_vc8.vcproj
index 9e0e305693..3beb9989b6 100644
--- a/samples/mediaplayer/mediaplayer_vc8.vcproj
+++ b/samples/mediaplayer/mediaplayer_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\mediaplayer\"
ObjectFile="vc_mswunivudll\mediaplayer\"
ProgramDataBaseFileName="vc_mswunivudll\mediaplayer.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\mediaplayer.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\mediaplayer.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\mediaplayer\"
ObjectFile="vc_mswunivuddll\mediaplayer\"
ProgramDataBaseFileName="vc_mswunivuddll\mediaplayer.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_media.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_media.lib 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"
OutputFile="vc_mswunivuddll\mediaplayer.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\mediaplayer.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\mediaplayer\"
ObjectFile="vc_mswudll\mediaplayer\"
ProgramDataBaseFileName="vc_mswudll\mediaplayer.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\mediaplayer.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\mediaplayer.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\mediaplayer\"
ObjectFile="vc_mswuddll\mediaplayer\"
ProgramDataBaseFileName="vc_mswuddll\mediaplayer.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_media.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_media.lib 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"
OutputFile="vc_mswuddll\mediaplayer.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\mediaplayer.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\mediaplayer\"
ObjectFile="vc_mswunivu\mediaplayer\"
ProgramDataBaseFileName="vc_mswunivu\mediaplayer.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\mediaplayer.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\mediaplayer.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\mediaplayer\"
ObjectFile="vc_mswunivud\mediaplayer\"
ProgramDataBaseFileName="vc_mswunivud\mediaplayer.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_media.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_media.lib 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"
OutputFile="vc_mswunivud\mediaplayer.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\mediaplayer.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\mediaplayer\"
ObjectFile="vc_mswu\mediaplayer\"
ProgramDataBaseFileName="vc_mswu\mediaplayer.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\mediaplayer.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\mediaplayer.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\mediaplayer\"
ObjectFile="vc_mswud\mediaplayer\"
ProgramDataBaseFileName="vc_mswud\mediaplayer.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_media.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_media.lib 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"
OutputFile="vc_mswud\mediaplayer.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\mediaplayer.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\mediaplayer.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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>
diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in
index 170dc1092b..956e244cb7 100644
--- a/samples/memcheck/Makefile.in
+++ b/samples/memcheck/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ MEMCHECK_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: memcheck$(EXEEXT) $(__memcheck_bundle___depname)
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
memcheck$(EXEEXT): $(MEMCHECK_OBJECTS) $(__memcheck___win32rc)
- $(CXX) -o $@ $(MEMCHECK_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(MEMCHECK_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)
$(__memcheck___mac_setfilecmd)
$(__memcheck___os2_emxbindcmd)
@@ -192,6 +192,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean memcheck_bundle
diff --git a/samples/memcheck/makefile.bcc b/samples/memcheck/makefile.bcc
index 72d9307ee0..77e2fdddd6 100644
--- a/samples/memcheck/makefile.bcc
+++ b/samples/memcheck/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\memcheck.ils del $(OBJS)\memcheck.ils
$(OBJS)\memcheck.exe: $(MEMCHECK_OBJECTS) $(OBJS)\memcheck_memcheck.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/memcheck/makefile.gcc b/samples/memcheck/makefile.gcc
index 82246d3a4b..70bc3b95fa 100644
--- a/samples/memcheck/makefile.gcc
+++ b/samples/memcheck/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\memcheck.exe del $(OBJS)\memcheck.exe
$(OBJS)\memcheck.exe: $(MEMCHECK_OBJECTS) $(OBJS)\memcheck_memcheck_rc.o
- $(CXX) -o $@ $(MEMCHECK_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(OBJS)\memcheck_memcheck.o: ./memcheck.cpp
$(CXX) -c -o $@ $(MEMCHECK_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/memcheck/makefile.unx b/samples/memcheck/makefile.unx
index f62f8c47bc..dce62f07a2 100644
--- a/samples/memcheck/makefile.unx
+++ b/samples/memcheck/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild memcheck
-install: all
+install:
uninstall:
diff --git a/samples/memcheck/makefile.vc b/samples/memcheck/makefile.vc
index db77feac04..e99c62bd52 100644
--- a/samples/memcheck/makefile.vc
+++ b/samples/memcheck/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\memcheck.pdb del $(OBJS)\memcheck.pdb
$(OBJS)\memcheck.exe: $(MEMCHECK_OBJECTS) $(OBJS)\memcheck_memcheck.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\memcheck.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\memcheck.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/memcheck/makefile.wat b/samples/memcheck/makefile.wat
index e8eb379b06..19a6a2163b 100644
--- a/samples/memcheck/makefile.wat
+++ b/samples/memcheck/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\memcheck.exe : $(MEMCHECK_OBJECTS) $(OBJS)\memcheck_memcheck.res
@%append $(OBJS)\memcheck.lbc option quiet
@%append $(OBJS)\memcheck.lbc name $^@
@%append $(OBJS)\memcheck.lbc option caseexact
- @%append $(OBJS)\memcheck.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\memcheck.lbc library %i
@%append $(OBJS)\memcheck.lbc option resource=$(OBJS)\memcheck_memcheck.res
diff --git a/samples/memcheck/memcheck_vc7.vcproj b/samples/memcheck/memcheck_vc7.vcproj
index 9dc8d104e0..e6c6ee02bf 100644
--- a/samples/memcheck/memcheck_vc7.vcproj
+++ b/samples/memcheck/memcheck_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\memcheck"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\memcheck\"
ObjectFile="vc_mswunivudll\memcheck\"
ProgramDataBaseFileName="vc_mswunivudll\memcheck.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\memcheck.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\memcheck.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\memcheck_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\memcheck"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\memcheck\"
ObjectFile="vc_mswunivuddll\memcheck\"
ProgramDataBaseFileName="vc_mswunivuddll\memcheck.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\memcheck.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\memcheck.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\memcheck_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\memcheck"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\memcheck\"
ObjectFile="vc_mswudll\memcheck\"
ProgramDataBaseFileName="vc_mswudll\memcheck.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\memcheck.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\memcheck.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\memcheck_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\memcheck"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\memcheck\"
ObjectFile="vc_mswuddll\memcheck\"
ProgramDataBaseFileName="vc_mswuddll\memcheck.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\memcheck.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\memcheck.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\memcheck_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\memcheck"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\memcheck\"
ObjectFile="vc_mswunivu\memcheck\"
ProgramDataBaseFileName="vc_mswunivu\memcheck.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\memcheck.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\memcheck.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\memcheck_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\memcheck"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\memcheck\"
ObjectFile="vc_mswunivud\memcheck\"
ProgramDataBaseFileName="vc_mswunivud\memcheck.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\memcheck.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\memcheck.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\memcheck_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\memcheck"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\memcheck\"
ObjectFile="vc_mswu\memcheck\"
ProgramDataBaseFileName="vc_mswu\memcheck.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\memcheck.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\memcheck.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\memcheck_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\memcheck"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\memcheck\"
ObjectFile="vc_mswud\memcheck\"
ProgramDataBaseFileName="vc_mswud\memcheck.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\memcheck.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\memcheck.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\memcheck_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\memcheck.cpp"/>
+ RelativePath=".\memcheck.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\memcheck.rc"/>
+ RelativePath=".\memcheck.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/memcheck/memcheck_vc8.vcproj b/samples/memcheck/memcheck_vc8.vcproj
index 060270c441..c482de1945 100644
--- a/samples/memcheck/memcheck_vc8.vcproj
+++ b/samples/memcheck/memcheck_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\memcheck\"
ObjectFile="vc_mswunivudll\memcheck\"
ProgramDataBaseFileName="vc_mswunivudll\memcheck.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\memcheck.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\memcheck.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\memcheck\"
ObjectFile="vc_mswunivuddll\memcheck\"
ProgramDataBaseFileName="vc_mswunivuddll\memcheck.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\memcheck.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\memcheck.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\memcheck\"
ObjectFile="vc_mswudll\memcheck\"
ProgramDataBaseFileName="vc_mswudll\memcheck.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\memcheck.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\memcheck.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\memcheck\"
ObjectFile="vc_mswuddll\memcheck\"
ProgramDataBaseFileName="vc_mswuddll\memcheck.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\memcheck.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\memcheck.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\memcheck\"
ObjectFile="vc_mswunivu\memcheck\"
ProgramDataBaseFileName="vc_mswunivu\memcheck.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\memcheck.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\memcheck.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\memcheck\"
ObjectFile="vc_mswunivud\memcheck\"
ProgramDataBaseFileName="vc_mswunivud\memcheck.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\memcheck.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\memcheck.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\memcheck\"
ObjectFile="vc_mswu\memcheck\"
ProgramDataBaseFileName="vc_mswu\memcheck.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\memcheck.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\memcheck.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\memcheck\"
ObjectFile="vc_mswud\memcheck\"
ProgramDataBaseFileName="vc_mswud\memcheck.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\memcheck.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\memcheck.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\memcheck.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\memcheck.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/menu/Makefile.in b/samples/menu/Makefile.in
index 7c9422ece5..80256b63ad 100644
--- a/samples/menu/Makefile.in
+++ b/samples/menu/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ MENU_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: menu$(EXEEXT) $(__menu_bundle___depname)
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
menu$(EXEEXT): $(MENU_OBJECTS) $(__menu___win32rc)
- $(CXX) -o $@ $(MENU_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(MENU_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)
$(__menu___mac_setfilecmd)
$(__menu___os2_emxbindcmd)
@@ -192,6 +192,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean menu_bundle
diff --git a/samples/menu/makefile.bcc b/samples/menu/makefile.bcc
index a2106cf7b0..7d75f22ec8 100644
--- a/samples/menu/makefile.bcc
+++ b/samples/menu/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\menu.ils del $(OBJS)\menu.ils
$(OBJS)\menu.exe: $(MENU_OBJECTS) $(OBJS)\menu_menu.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/menu/makefile.gcc b/samples/menu/makefile.gcc
index 199588622f..d355039150 100644
--- a/samples/menu/makefile.gcc
+++ b/samples/menu/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\menu.exe del $(OBJS)\menu.exe
$(OBJS)\menu.exe: $(MENU_OBJECTS) $(OBJS)\menu_menu_rc.o
- $(CXX) -o $@ $(MENU_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(OBJS)\menu_menu.o: ./menu.cpp
$(CXX) -c -o $@ $(MENU_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/menu/makefile.unx b/samples/menu/makefile.unx
index f83910ff64..c40c42de91 100644
--- a/samples/menu/makefile.unx
+++ b/samples/menu/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild menu
-install: all
+install:
uninstall:
diff --git a/samples/menu/makefile.vc b/samples/menu/makefile.vc
index 4d89fc3c3a..741197b1e4 100644
--- a/samples/menu/makefile.vc
+++ b/samples/menu/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\menu.pdb del $(OBJS)\menu.pdb
$(OBJS)\menu.exe: $(MENU_OBJECTS) $(OBJS)\menu_menu.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\menu.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\menu.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/menu/makefile.wat b/samples/menu/makefile.wat
index 49701738df..1440fdd41c 100644
--- a/samples/menu/makefile.wat
+++ b/samples/menu/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\menu.exe : $(MENU_OBJECTS) $(OBJS)\menu_menu.res
@%append $(OBJS)\menu.lbc option quiet
@%append $(OBJS)\menu.lbc name $^@
@%append $(OBJS)\menu.lbc option caseexact
- @%append $(OBJS)\menu.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\menu.lbc library %i
@%append $(OBJS)\menu.lbc option resource=$(OBJS)\menu_menu.res
diff --git a/samples/menu/menu_vc7.vcproj b/samples/menu/menu_vc7.vcproj
index a56fdfbcb7..c7b32481ab 100644
--- a/samples/menu/menu_vc7.vcproj
+++ b/samples/menu/menu_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\menu"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\menu\"
ObjectFile="vc_mswunivudll\menu\"
ProgramDataBaseFileName="vc_mswunivudll\menu.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\menu.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\menu.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\menu_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\menu"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\menu\"
ObjectFile="vc_mswunivuddll\menu\"
ProgramDataBaseFileName="vc_mswunivuddll\menu.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\menu.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\menu.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\menu_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\menu"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\menu\"
ObjectFile="vc_mswudll\menu\"
ProgramDataBaseFileName="vc_mswudll\menu.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\menu.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\menu.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\menu_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\menu"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\menu\"
ObjectFile="vc_mswuddll\menu\"
ProgramDataBaseFileName="vc_mswuddll\menu.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\menu.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\menu.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\menu_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\menu"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\menu\"
ObjectFile="vc_mswunivu\menu\"
ProgramDataBaseFileName="vc_mswunivu\menu.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\menu.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\menu.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\menu_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\menu"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\menu\"
ObjectFile="vc_mswunivud\menu\"
ProgramDataBaseFileName="vc_mswunivud\menu.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\menu.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\menu.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\menu_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\menu"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\menu\"
ObjectFile="vc_mswu\menu\"
ProgramDataBaseFileName="vc_mswu\menu.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\menu.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\menu.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\menu_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\menu"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\menu\"
ObjectFile="vc_mswud\menu\"
ProgramDataBaseFileName="vc_mswud\menu.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\menu.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\menu.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\menu_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\menu.cpp"/>
+ RelativePath=".\menu.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\menu.rc"/>
+ RelativePath=".\menu.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/menu/menu_vc8.vcproj b/samples/menu/menu_vc8.vcproj
index 192fdc235c..0b9027930e 100644
--- a/samples/menu/menu_vc8.vcproj
+++ b/samples/menu/menu_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\menu\"
ObjectFile="vc_mswunivudll\menu\"
ProgramDataBaseFileName="vc_mswunivudll\menu.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\menu.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\menu.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\menu\"
ObjectFile="vc_mswunivuddll\menu\"
ProgramDataBaseFileName="vc_mswunivuddll\menu.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\menu.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\menu.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\menu\"
ObjectFile="vc_mswudll\menu\"
ProgramDataBaseFileName="vc_mswudll\menu.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\menu.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\menu.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\menu\"
ObjectFile="vc_mswuddll\menu\"
ProgramDataBaseFileName="vc_mswuddll\menu.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\menu.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\menu.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\menu\"
ObjectFile="vc_mswunivu\menu\"
ProgramDataBaseFileName="vc_mswunivu\menu.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\menu.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\menu.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\menu\"
ObjectFile="vc_mswunivud\menu\"
ProgramDataBaseFileName="vc_mswunivud\menu.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\menu.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\menu.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\menu\"
ObjectFile="vc_mswu\menu\"
ProgramDataBaseFileName="vc_mswu\menu.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\menu.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\menu.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\menu\"
ObjectFile="vc_mswud\menu\"
ProgramDataBaseFileName="vc_mswud\menu.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\menu.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\menu.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\menu.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\menu.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/mfc/Makefile.in b/samples/mfc/Makefile.in
index ce3c8b2957..b878198f0f 100644
--- a/samples/mfc/Makefile.in
+++ b/samples/mfc/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ MFCTEST_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: mfctest$(EXEEXT) $(__mfctest_bundle___depname)
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
mfctest$(EXEEXT): $(MFCTEST_OBJECTS) $(__mfctest___win32rc)
- $(CXX) -o $@ $(MFCTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(MFCTEST_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)
$(__mfctest___mac_setfilecmd)
$(__mfctest___os2_emxbindcmd)
@@ -192,6 +192,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean mfctest_bundle
diff --git a/samples/mfc/makefile.bcc b/samples/mfc/makefile.bcc
index 11fb078f4b..f57c46b042 100644
--- a/samples/mfc/makefile.bcc
+++ b/samples/mfc/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\mfctest.ils del $(OBJS)\mfctest.ils
$(OBJS)\mfctest.exe: $(MFCTEST_OBJECTS) $(OBJS)\mfctest_mfctest.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
c0w32.obj $(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) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\mfctest_mfctest.res
|
diff --git a/samples/mfc/makefile.gcc b/samples/mfc/makefile.gcc
index ef389b80fb..69fb22390e 100644
--- a/samples/mfc/makefile.gcc
+++ b/samples/mfc/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\mfctest.exe del $(OBJS)\mfctest.exe
$(OBJS)\mfctest.exe: $(MFCTEST_OBJECTS) $(OBJS)\mfctest_mfctest_rc.o
- $(CXX) -o $@ $(MFCTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(CXX) -o $@ $(MFCTEST_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
$(OBJS)\mfctest_mfctest.o: ./mfctest.cpp
$(CXX) -c -o $@ $(MFCTEST_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/mfc/makefile.unx b/samples/mfc/makefile.unx
index 803d885ec2..24c11ef95f 100644
--- a/samples/mfc/makefile.unx
+++ b/samples/mfc/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild mfctest
-install: all
+install:
uninstall:
diff --git a/samples/mfc/makefile.vc b/samples/mfc/makefile.vc
index 06eb7036c7..860636bf02 100644
--- a/samples/mfc/makefile.vc
+++ b/samples/mfc/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\mfctest.pdb del $(OBJS)\mfctest.pdb
$(OBJS)\mfctest.exe: $(MFCTEST_OBJECTS) $(OBJS)\mfctest_mfctest.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\mfctest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\mfctest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/mfc/makefile.wat b/samples/mfc/makefile.wat
index 951049667f..6309595e34 100644
--- a/samples/mfc/makefile.wat
+++ b/samples/mfc/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\mfctest.exe : $(MFCTEST_OBJECTS) $(OBJS)\mfctest_mfctest.res
@%append $(OBJS)\mfctest.lbc option quiet
@%append $(OBJS)\mfctest.lbc name $^@
@%append $(OBJS)\mfctest.lbc option caseexact
- @%append $(OBJS)\mfctest.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%append $(OBJS)\mfctest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
@for %i in ($(MFCTEST_OBJECTS)) do @%append $(OBJS)\mfctest.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) do @%append $(OBJS)\mfctest.lbc library %i
@%append $(OBJS)\mfctest.lbc option resource=$(OBJS)\mfctest_mfctest.res
diff --git a/samples/mfc/mfc_vc7.vcproj b/samples/mfc/mfc_vc7.vcproj
index 82616e6ef5..dfed6fce01 100644
--- a/samples/mfc/mfc_vc7.vcproj
+++ b/samples/mfc/mfc_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\mfctest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\mfctest\"
ObjectFile="vc_mswunivudll\mfctest\"
ProgramDataBaseFileName="vc_mswunivudll\mfctest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\mfctest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\mfctest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\mfc_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\mfctest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\mfctest\"
ObjectFile="vc_mswunivuddll\mfctest\"
ProgramDataBaseFileName="vc_mswunivuddll\mfctest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\mfctest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\mfctest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\mfc_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\mfctest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\mfctest\"
ObjectFile="vc_mswudll\mfctest\"
ProgramDataBaseFileName="vc_mswudll\mfctest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\mfctest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\mfctest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\mfc_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\mfctest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\mfctest\"
ObjectFile="vc_mswuddll\mfctest\"
ProgramDataBaseFileName="vc_mswuddll\mfctest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\mfctest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\mfctest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\mfc_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\mfctest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\mfctest\"
ObjectFile="vc_mswunivu\mfctest\"
ProgramDataBaseFileName="vc_mswunivu\mfctest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\mfctest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\mfctest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\mfc_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\mfctest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\mfctest\"
ObjectFile="vc_mswunivud\mfctest\"
ProgramDataBaseFileName="vc_mswunivud\mfctest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\mfctest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\mfctest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\mfc_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\mfctest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\mfctest\"
ObjectFile="vc_mswu\mfctest\"
ProgramDataBaseFileName="vc_mswu\mfctest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\mfctest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\mfctest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\mfc_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\mfctest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\mfctest\"
ObjectFile="vc_mswud\mfctest\"
ProgramDataBaseFileName="vc_mswud\mfctest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\mfctest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\mfctest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\mfc_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\mfctest.cpp"/>
+ RelativePath=".\mfctest.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\mfctest.rc"/>
+ RelativePath=".\mfctest.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/mfc/mfc_vc8.vcproj b/samples/mfc/mfc_vc8.vcproj
index 6d402dc51a..c50eb0bdc3 100644
--- a/samples/mfc/mfc_vc8.vcproj
+++ b/samples/mfc/mfc_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\mfctest\"
ObjectFile="vc_mswunivudll\mfctest\"
ProgramDataBaseFileName="vc_mswunivudll\mfctest.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\mfctest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\mfctest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\mfctest\"
ObjectFile="vc_mswunivuddll\mfctest\"
ProgramDataBaseFileName="vc_mswunivuddll\mfctest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\mfctest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\mfctest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\mfctest\"
ObjectFile="vc_mswudll\mfctest\"
ProgramDataBaseFileName="vc_mswudll\mfctest.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\mfctest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\mfctest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\mfctest\"
ObjectFile="vc_mswuddll\mfctest\"
ProgramDataBaseFileName="vc_mswuddll\mfctest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\mfctest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\mfctest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\mfctest\"
ObjectFile="vc_mswunivu\mfctest\"
ProgramDataBaseFileName="vc_mswunivu\mfctest.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\mfctest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\mfctest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\mfctest\"
ObjectFile="vc_mswunivud\mfctest\"
ProgramDataBaseFileName="vc_mswunivud\mfctest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\mfctest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\mfctest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\mfctest\"
ObjectFile="vc_mswu\mfctest\"
ProgramDataBaseFileName="vc_mswu\mfctest.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\mfctest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\mfctest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\mfctest\"
ObjectFile="vc_mswud\mfctest\"
ProgramDataBaseFileName="vc_mswud\mfctest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\mfctest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\mfctest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\mfctest.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\mfctest.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in
index 4792c4d632..d59a41b996 100644
--- a/samples/minimal/Makefile.in
+++ b/samples/minimal/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ MINIMAL_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: minimal$(EXEEXT) $(__minimal_bundle___depname)
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
minimal$(EXEEXT): $(MINIMAL_OBJECTS) $(__minimal___win32rc)
- $(CXX) -o $@ $(MINIMAL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(MINIMAL_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)
$(__minimal___mac_setfilecmd)
$(__minimal___os2_emxbindcmd)
@@ -192,6 +192,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean minimal_bundle
diff --git a/samples/minimal/makefile.bcc b/samples/minimal/makefile.bcc
index 4a4bb7128a..077812442e 100644
--- a/samples/minimal/makefile.bcc
+++ b/samples/minimal/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\minimal.ils del $(OBJS)\minimal.ils
$(OBJS)\minimal.exe: $(MINIMAL_OBJECTS) $(OBJS)\minimal_sample.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/minimal/makefile.gcc b/samples/minimal/makefile.gcc
index 95dd7816f1..c0ca71e70e 100644
--- a/samples/minimal/makefile.gcc
+++ b/samples/minimal/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\minimal.exe del $(OBJS)\minimal.exe
$(OBJS)\minimal.exe: $(MINIMAL_OBJECTS) $(OBJS)\minimal_sample_rc.o
- $(CXX) -o $@ $(MINIMAL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(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
diff --git a/samples/minimal/makefile.unx b/samples/minimal/makefile.unx
index f456f01b76..d99922efa9 100644
--- a/samples/minimal/makefile.unx
+++ b/samples/minimal/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild minimal
-install: all
+install:
uninstall:
diff --git a/samples/minimal/makefile.vc b/samples/minimal/makefile.vc
index fa8601d609..18d499fcbe 100644
--- a/samples/minimal/makefile.vc
+++ b/samples/minimal/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\minimal.pdb del $(OBJS)\minimal.pdb
$(OBJS)\minimal.exe: $(MINIMAL_OBJECTS) $(OBJS)\minimal_sample.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\minimal.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\minimal.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/minimal/makefile.wat b/samples/minimal/makefile.wat
index 2d8d98ebad..5fcf0798e8 100644
--- a/samples/minimal/makefile.wat
+++ b/samples/minimal/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\minimal.exe : $(MINIMAL_OBJECTS) $(OBJS)\minimal_sample.res
@%append $(OBJS)\minimal.lbc option quiet
@%append $(OBJS)\minimal.lbc name $^@
@%append $(OBJS)\minimal.lbc option caseexact
- @%append $(OBJS)\minimal.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\minimal.lbc library %i
@%append $(OBJS)\minimal.lbc option resource=$(OBJS)\minimal_sample.res
diff --git a/samples/minimal/minimal_vc7.vcproj b/samples/minimal/minimal_vc7.vcproj
index 66959b01b7..f763605542 100644
--- a/samples/minimal/minimal_vc7.vcproj
+++ b/samples/minimal/minimal_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\minimal"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\minimal\"
ObjectFile="vc_mswunivudll\minimal\"
ProgramDataBaseFileName="vc_mswunivudll\minimal.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\minimal.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\minimal.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\minimal_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\minimal"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\minimal\"
ObjectFile="vc_mswunivuddll\minimal\"
ProgramDataBaseFileName="vc_mswunivuddll\minimal.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\minimal.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\minimal.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\minimal_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\minimal"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\minimal\"
ObjectFile="vc_mswudll\minimal\"
ProgramDataBaseFileName="vc_mswudll\minimal.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\minimal.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\minimal.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\minimal_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\minimal"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\minimal\"
ObjectFile="vc_mswuddll\minimal\"
ProgramDataBaseFileName="vc_mswuddll\minimal.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\minimal.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\minimal.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\minimal_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\minimal"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\minimal\"
ObjectFile="vc_mswunivu\minimal\"
ProgramDataBaseFileName="vc_mswunivu\minimal.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\minimal.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\minimal.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\minimal_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\minimal"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\minimal\"
ObjectFile="vc_mswunivud\minimal\"
ProgramDataBaseFileName="vc_mswunivud\minimal.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\minimal.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\minimal.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\minimal_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\minimal"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\minimal\"
ObjectFile="vc_mswu\minimal\"
ProgramDataBaseFileName="vc_mswu\minimal.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\minimal.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\minimal.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\minimal_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\minimal"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\minimal\"
ObjectFile="vc_mswud\minimal\"
ProgramDataBaseFileName="vc_mswud\minimal.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\minimal.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\minimal.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\minimal_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\minimal.cpp"/>
+ RelativePath=".\minimal.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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"/>
+ RelativePath=".\..\..\samples\sample.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/minimal/minimal_vc8.vcproj b/samples/minimal/minimal_vc8.vcproj
index 8255d3b09a..b19d65c70b 100644
--- a/samples/minimal/minimal_vc8.vcproj
+++ b/samples/minimal/minimal_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\minimal\"
ObjectFile="vc_mswunivudll\minimal\"
ProgramDataBaseFileName="vc_mswunivudll\minimal.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\minimal.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\minimal.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\minimal\"
ObjectFile="vc_mswunivuddll\minimal\"
ProgramDataBaseFileName="vc_mswunivuddll\minimal.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\minimal.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\minimal.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\minimal\"
ObjectFile="vc_mswudll\minimal\"
ProgramDataBaseFileName="vc_mswudll\minimal.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\minimal.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\minimal.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\minimal\"
ObjectFile="vc_mswuddll\minimal\"
ProgramDataBaseFileName="vc_mswuddll\minimal.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\minimal.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\minimal.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\minimal\"
ObjectFile="vc_mswunivu\minimal\"
ProgramDataBaseFileName="vc_mswunivu\minimal.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\minimal.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\minimal.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\minimal\"
ObjectFile="vc_mswunivud\minimal\"
ProgramDataBaseFileName="vc_mswunivud\minimal.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\minimal.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\minimal.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\minimal\"
ObjectFile="vc_mswu\minimal\"
ProgramDataBaseFileName="vc_mswu\minimal.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\minimal.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\minimal.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\minimal\"
ObjectFile="vc_mswud\minimal\"
ProgramDataBaseFileName="vc_mswud\minimal.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\minimal.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\minimal.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\minimal.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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>
diff --git a/samples/mobile/Makefile.in b/samples/mobile/Makefile.in
index ce6a0fb6a7..268de4e976 100644
--- a/samples/mobile/Makefile.in
+++ b/samples/mobile/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -23,7 +23,7 @@ DESTDIR =
all: styles wxedit
-install: all
+install:
uninstall:
@@ -48,6 +48,6 @@ wxedit:
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean styles wxedit
diff --git a/samples/mobile/makefile.bcc b/samples/mobile/makefile.bcc
index fe416b97f7..fa6d29fdb2 100644
--- a/samples/mobile/makefile.bcc
+++ b/samples/mobile/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -28,8 +28,9 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
-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_RICHTEXT="$(USE_RICHTEXT)" \
- -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \
+ -DUSE_AUI="$(USE_AUI)" -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)" \
diff --git a/samples/mobile/makefile.gcc b/samples/mobile/makefile.gcc
index a166ee886b..22173063c7 100644
--- a/samples/mobile/makefile.gcc
+++ b/samples/mobile/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -20,8 +20,8 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
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_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
- USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
+ 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)" \
diff --git a/samples/mobile/makefile.unx b/samples/mobile/makefile.unx
index bd53f33964..27b7a65329 100644
--- a/samples/mobile/makefile.unx
+++ b/samples/mobile/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -27,7 +27,7 @@
all: styles wxedit
-install: all
+install:
uninstall:
diff --git a/samples/mobile/makefile.vc b/samples/mobile/makefile.vc
index 1718142fda..16c96de9a3 100644
--- a/samples/mobile/makefile.vc
+++ b/samples/mobile/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -19,8 +19,8 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
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_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
- USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
+ 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)" \
diff --git a/samples/mobile/makefile.wat b/samples/mobile/makefile.wat
index 2b6c484384..0982a94c68 100644
--- a/samples/mobile/makefile.wat
+++ b/samples/mobile/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -36,8 +36,8 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
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_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" &
- USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" &
+ 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)" &
diff --git a/samples/mobile/styles/Makefile.in b/samples/mobile/styles/Makefile.in
index 2c188852c2..e288124835 100644
--- a/samples/mobile/styles/Makefile.in
+++ b/samples/mobile/styles/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ STYLES_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: styles$(EXEEXT) $(__styles_bundle___depname) data
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
styles$(EXEEXT): $(STYLES_OBJECTS) $(__styles___win32rc)
- $(CXX) -o $@ $(STYLES_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(STYLES_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)
$(__styles___mac_setfilecmd)
$(__styles___os2_emxbindcmd)
@@ -204,6 +204,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean styles_bundle data
diff --git a/samples/mobile/styles/makefile.bcc b/samples/mobile/styles/makefile.bcc
index aa0666551e..04063c9c46 100644
--- a/samples/mobile/styles/makefile.bcc
+++ b/samples/mobile/styles/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\styles.ils del $(OBJS)\styles.ils
$(OBJS)\styles.exe: $(STYLES_OBJECTS) $(OBJS)\styles_sample.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
c0w32.obj $(STYLES_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)\styles_sample.res
|
diff --git a/samples/mobile/styles/makefile.gcc b/samples/mobile/styles/makefile.gcc
index 53cd821372..79b14196a2 100644
--- a/samples/mobile/styles/makefile.gcc
+++ b/samples/mobile/styles/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\styles.exe del $(OBJS)\styles.exe
$(OBJS)\styles.exe: $(STYLES_OBJECTS) $(OBJS)\styles_sample_rc.o
- $(CXX) -o $@ $(STYLES_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(CXX) -o $@ $(STYLES_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
data:
if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/mobile/styles/makefile.unx b/samples/mobile/styles/makefile.unx
index 3e49cd3e98..8f570ebc7b 100644
--- a/samples/mobile/styles/makefile.unx
+++ b/samples/mobile/styles/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild styles
-install: all
+install:
uninstall:
diff --git a/samples/mobile/styles/makefile.vc b/samples/mobile/styles/makefile.vc
index d33aba7af3..0d7bd307de 100644
--- a/samples/mobile/styles/makefile.vc
+++ b/samples/mobile/styles/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\styles.pdb del $(OBJS)\styles.pdb
$(OBJS)\styles.exe: $(STYLES_OBJECTS) $(OBJS)\styles_sample.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\styles.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\styles.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(STYLES_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
<<
diff --git a/samples/mobile/styles/makefile.wat b/samples/mobile/styles/makefile.wat
index 1709e93a3d..94ceb1bc0e 100644
--- a/samples/mobile/styles/makefile.wat
+++ b/samples/mobile/styles/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\styles.exe : $(STYLES_OBJECTS) $(OBJS)\styles_sample.res
@%append $(OBJS)\styles.lbc option quiet
@%append $(OBJS)\styles.lbc name $^@
@%append $(OBJS)\styles.lbc option caseexact
- @%append $(OBJS)\styles.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%append $(OBJS)\styles.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
@for %i in ($(STYLES_OBJECTS)) do @%append $(OBJS)\styles.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) do @%append $(OBJS)\styles.lbc library %i
@%append $(OBJS)\styles.lbc option resource=$(OBJS)\styles_sample.res
diff --git a/samples/mobile/styles/styles_vc7.vcproj b/samples/mobile/styles/styles_vc7.vcproj
index cb98b683b9..1452700d1b 100644
--- a/samples/mobile/styles/styles_vc7.vcproj
+++ b/samples/mobile/styles/styles_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\styles"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\styles\"
ObjectFile="vc_mswunivudll\styles\"
ProgramDataBaseFileName="vc_mswunivudll\styles.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\styles.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\styles.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\styles_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\styles"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\styles\"
ObjectFile="vc_mswunivuddll\styles\"
ProgramDataBaseFileName="vc_mswunivuddll\styles.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\styles.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\styles.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\styles_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\styles"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\styles\"
ObjectFile="vc_mswudll\styles\"
ProgramDataBaseFileName="vc_mswudll\styles.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\styles.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\styles.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\styles_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\styles"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\styles\"
ObjectFile="vc_mswuddll\styles\"
ProgramDataBaseFileName="vc_mswuddll\styles.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\styles.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\styles.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\styles_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\styles"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\styles\"
ObjectFile="vc_mswunivu\styles\"
ProgramDataBaseFileName="vc_mswunivu\styles.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\styles.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\styles.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\styles_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\styles"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\styles\"
ObjectFile="vc_mswunivud\styles\"
ProgramDataBaseFileName="vc_mswunivud\styles.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\styles.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\styles.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\styles_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\styles"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\styles\"
ObjectFile="vc_mswu\styles\"
ProgramDataBaseFileName="vc_mswu\styles.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\styles.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\styles.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\styles_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\styles"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\styles\"
ObjectFile="vc_mswud\styles\"
ProgramDataBaseFileName="vc_mswud\styles.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\styles.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\styles.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\styles_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\styles.cpp"/>
+ RelativePath=".\styles.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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"/>
+ RelativePath=".\..\..\..\samples\sample.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/mobile/styles/styles_vc8.vcproj b/samples/mobile/styles/styles_vc8.vcproj
index 88d19cb1c7..a83a3d6c56 100644
--- a/samples/mobile/styles/styles_vc8.vcproj
+++ b/samples/mobile/styles/styles_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\styles\"
ObjectFile="vc_mswunivudll\styles\"
ProgramDataBaseFileName="vc_mswunivudll\styles.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\styles.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\styles.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\styles\"
ObjectFile="vc_mswunivuddll\styles\"
ProgramDataBaseFileName="vc_mswunivuddll\styles.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\styles.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\styles.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\styles\"
ObjectFile="vc_mswudll\styles\"
ProgramDataBaseFileName="vc_mswudll\styles.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\styles.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\styles.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\styles\"
ObjectFile="vc_mswuddll\styles\"
ProgramDataBaseFileName="vc_mswuddll\styles.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\styles.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\styles.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\styles\"
ObjectFile="vc_mswunivu\styles\"
ProgramDataBaseFileName="vc_mswunivu\styles.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\styles.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\styles.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\styles\"
ObjectFile="vc_mswunivud\styles\"
ProgramDataBaseFileName="vc_mswunivud\styles.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\styles.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\styles.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\styles\"
ObjectFile="vc_mswu\styles\"
ProgramDataBaseFileName="vc_mswu\styles.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\styles.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\styles.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\styles\"
ObjectFile="vc_mswud\styles\"
ProgramDataBaseFileName="vc_mswud\styles.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\styles.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\styles.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\styles.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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>
diff --git a/samples/mobile/wxedit/Makefile.in b/samples/mobile/wxedit/Makefile.in
index 128ded3271..4ae340fce7 100644
--- a/samples/mobile/wxedit/Makefile.in
+++ b/samples/mobile/wxedit/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ WXEDIT_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: wxedit$(EXEEXT) $(__wxedit_bundle___depname)
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
wxedit$(EXEEXT): $(WXEDIT_OBJECTS) $(__wxedit___win32rc)
- $(CXX) -o $@ $(WXEDIT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(WXEDIT_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)
$(__wxedit___mac_setfilecmd)
$(__wxedit___os2_emxbindcmd)
@@ -192,6 +192,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean wxedit_bundle
diff --git a/samples/mobile/wxedit/makefile.bcc b/samples/mobile/wxedit/makefile.bcc
index df33cd33c9..90fdec2b7f 100644
--- a/samples/mobile/wxedit/makefile.bcc
+++ b/samples/mobile/wxedit/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\wxedit.ils del $(OBJS)\wxedit.ils
$(OBJS)\wxedit.exe: $(WXEDIT_OBJECTS) $(OBJS)\wxedit_sample.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
c0w32.obj $(WXEDIT_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)\wxedit_sample.res
|
diff --git a/samples/mobile/wxedit/makefile.gcc b/samples/mobile/wxedit/makefile.gcc
index ea0ddae72b..473c19fa87 100644
--- a/samples/mobile/wxedit/makefile.gcc
+++ b/samples/mobile/wxedit/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\wxedit.exe del $(OBJS)\wxedit.exe
$(OBJS)\wxedit.exe: $(WXEDIT_OBJECTS) $(OBJS)\wxedit_sample_rc.o
- $(CXX) -o $@ $(WXEDIT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(CXX) -o $@ $(WXEDIT_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
$(OBJS)\wxedit_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
diff --git a/samples/mobile/wxedit/makefile.unx b/samples/mobile/wxedit/makefile.unx
index e052371b04..3da4974b72 100644
--- a/samples/mobile/wxedit/makefile.unx
+++ b/samples/mobile/wxedit/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild wxedit
-install: all
+install:
uninstall:
diff --git a/samples/mobile/wxedit/makefile.vc b/samples/mobile/wxedit/makefile.vc
index ab2e6e88de..14fd97ff72 100644
--- a/samples/mobile/wxedit/makefile.vc
+++ b/samples/mobile/wxedit/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\wxedit.pdb del $(OBJS)\wxedit.pdb
$(OBJS)\wxedit.exe: $(WXEDIT_OBJECTS) $(OBJS)\wxedit_sample.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxedit.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxedit.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(WXEDIT_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
<<
diff --git a/samples/mobile/wxedit/makefile.wat b/samples/mobile/wxedit/makefile.wat
index 54678979e6..a0f4f2fee4 100644
--- a/samples/mobile/wxedit/makefile.wat
+++ b/samples/mobile/wxedit/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\wxedit.exe : $(WXEDIT_OBJECTS) $(OBJS)\wxedit_sample.res
@%append $(OBJS)\wxedit.lbc option quiet
@%append $(OBJS)\wxedit.lbc name $^@
@%append $(OBJS)\wxedit.lbc option caseexact
- @%append $(OBJS)\wxedit.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%append $(OBJS)\wxedit.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
@for %i in ($(WXEDIT_OBJECTS)) do @%append $(OBJS)\wxedit.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) do @%append $(OBJS)\wxedit.lbc library %i
@%append $(OBJS)\wxedit.lbc option resource=$(OBJS)\wxedit_sample.res
diff --git a/samples/mobile/wxedit/wxedit_vc7.vcproj b/samples/mobile/wxedit/wxedit_vc7.vcproj
index 5271c09837..4989ff787c 100644
--- a/samples/mobile/wxedit/wxedit_vc7.vcproj
+++ b/samples/mobile/wxedit/wxedit_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\wxedit"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\wxedit\"
ObjectFile="vc_mswunivudll\wxedit\"
ProgramDataBaseFileName="vc_mswunivudll\wxedit.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\wxedit.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\wxedit.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\wxedit_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\wxedit"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\wxedit\"
ObjectFile="vc_mswunivuddll\wxedit\"
ProgramDataBaseFileName="vc_mswunivuddll\wxedit.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\wxedit.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\wxedit.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\wxedit_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\wxedit"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\wxedit\"
ObjectFile="vc_mswudll\wxedit\"
ProgramDataBaseFileName="vc_mswudll\wxedit.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\wxedit.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\wxedit.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\wxedit_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\wxedit"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\wxedit\"
ObjectFile="vc_mswuddll\wxedit\"
ProgramDataBaseFileName="vc_mswuddll\wxedit.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\wxedit.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\wxedit.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\wxedit_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\wxedit"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\wxedit\"
ObjectFile="vc_mswunivu\wxedit\"
ProgramDataBaseFileName="vc_mswunivu\wxedit.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\wxedit.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\wxedit.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\wxedit_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\wxedit"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\wxedit\"
ObjectFile="vc_mswunivud\wxedit\"
ProgramDataBaseFileName="vc_mswunivud\wxedit.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\wxedit.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\wxedit.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\wxedit_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\wxedit"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\wxedit\"
ObjectFile="vc_mswu\wxedit\"
ProgramDataBaseFileName="vc_mswu\wxedit.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\wxedit.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\wxedit.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\wxedit_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\wxedit"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\wxedit\"
ObjectFile="vc_mswud\wxedit\"
ProgramDataBaseFileName="vc_mswud\wxedit.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\wxedit.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\wxedit.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\wxedit_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\wxedit.cpp"/>
+ RelativePath=".\wxedit.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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"/>
+ RelativePath=".\..\..\..\samples\sample.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/mobile/wxedit/wxedit_vc8.vcproj b/samples/mobile/wxedit/wxedit_vc8.vcproj
index 3d83f3b37a..04afe8db76 100644
--- a/samples/mobile/wxedit/wxedit_vc8.vcproj
+++ b/samples/mobile/wxedit/wxedit_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\wxedit\"
ObjectFile="vc_mswunivudll\wxedit\"
ProgramDataBaseFileName="vc_mswunivudll\wxedit.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\wxedit.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\wxedit.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\wxedit\"
ObjectFile="vc_mswunivuddll\wxedit\"
ProgramDataBaseFileName="vc_mswunivuddll\wxedit.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\wxedit.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\wxedit.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\wxedit\"
ObjectFile="vc_mswudll\wxedit\"
ProgramDataBaseFileName="vc_mswudll\wxedit.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\wxedit.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\wxedit.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\wxedit\"
ObjectFile="vc_mswuddll\wxedit\"
ProgramDataBaseFileName="vc_mswuddll\wxedit.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\wxedit.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\wxedit.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\wxedit\"
ObjectFile="vc_mswunivu\wxedit\"
ProgramDataBaseFileName="vc_mswunivu\wxedit.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\wxedit.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\wxedit.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\wxedit\"
ObjectFile="vc_mswunivud\wxedit\"
ProgramDataBaseFileName="vc_mswunivud\wxedit.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\wxedit.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\wxedit.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\wxedit\"
ObjectFile="vc_mswu\wxedit\"
ProgramDataBaseFileName="vc_mswu\wxedit.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\wxedit.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\wxedit.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\wxedit\"
ObjectFile="vc_mswud\wxedit\"
ProgramDataBaseFileName="vc_mswud\wxedit.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\wxedit.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\wxedit.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\wxedit.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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>
diff --git a/samples/nativdlg/Makefile.in b/samples/nativdlg/Makefile.in
index 387ff15310..93b528661e 100644
--- a/samples/nativdlg/Makefile.in
+++ b/samples/nativdlg/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ NATIVDLG_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: nativdlg$(EXEEXT) $(__nativdlg_bundle___depname)
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
nativdlg$(EXEEXT): $(NATIVDLG_OBJECTS) $(__nativdlg___win32rc)
- $(CXX) -o $@ $(NATIVDLG_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(NATIVDLG_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)
$(__nativdlg___mac_setfilecmd)
$(__nativdlg___os2_emxbindcmd)
@@ -192,6 +192,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean nativdlg_bundle
diff --git a/samples/nativdlg/makefile.bcc b/samples/nativdlg/makefile.bcc
index 35de4e5881..4ba4031493 100644
--- a/samples/nativdlg/makefile.bcc
+++ b/samples/nativdlg/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\nativdlg.ils del $(OBJS)\nativdlg.ils
$(OBJS)\nativdlg.exe: $(NATIVDLG_OBJECTS) $(OBJS)\nativdlg_nativdlg.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/nativdlg/makefile.gcc b/samples/nativdlg/makefile.gcc
index 0a2071842d..13699ebee8 100644
--- a/samples/nativdlg/makefile.gcc
+++ b/samples/nativdlg/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\nativdlg.exe del $(OBJS)\nativdlg.exe
$(OBJS)\nativdlg.exe: $(NATIVDLG_OBJECTS) $(OBJS)\nativdlg_nativdlg_rc.o
- $(CXX) -o $@ $(NATIVDLG_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(OBJS)\nativdlg_nativdlg.o: ./nativdlg.cpp
$(CXX) -c -o $@ $(NATIVDLG_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/nativdlg/makefile.unx b/samples/nativdlg/makefile.unx
index 6bf9fa07b8..57d1ed7deb 100644
--- a/samples/nativdlg/makefile.unx
+++ b/samples/nativdlg/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild nativdlg
-install: all
+install:
uninstall:
diff --git a/samples/nativdlg/makefile.vc b/samples/nativdlg/makefile.vc
index 73169f690b..1a483f6e7a 100644
--- a/samples/nativdlg/makefile.vc
+++ b/samples/nativdlg/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\nativdlg.pdb del $(OBJS)\nativdlg.pdb
$(OBJS)\nativdlg.exe: $(NATIVDLG_OBJECTS) $(OBJS)\nativdlg_nativdlg.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\nativdlg.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\nativdlg.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/nativdlg/makefile.wat b/samples/nativdlg/makefile.wat
index 76bf3a6c58..e767577987 100644
--- a/samples/nativdlg/makefile.wat
+++ b/samples/nativdlg/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\nativdlg.exe : $(NATIVDLG_OBJECTS) $(OBJS)\nativdlg_nativdlg.res
@%append $(OBJS)\nativdlg.lbc option quiet
@%append $(OBJS)\nativdlg.lbc name $^@
@%append $(OBJS)\nativdlg.lbc option caseexact
- @%append $(OBJS)\nativdlg.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\nativdlg.lbc library %i
@%append $(OBJS)\nativdlg.lbc option resource=$(OBJS)\nativdlg_nativdlg.res
diff --git a/samples/nativdlg/nativdlg_vc7.vcproj b/samples/nativdlg/nativdlg_vc7.vcproj
index e2b22edaa0..9cd9bc932e 100644
--- a/samples/nativdlg/nativdlg_vc7.vcproj
+++ b/samples/nativdlg/nativdlg_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\nativdlg"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\nativdlg\"
ObjectFile="vc_mswunivudll\nativdlg\"
ProgramDataBaseFileName="vc_mswunivudll\nativdlg.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\nativdlg.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\nativdlg.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\nativdlg_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\nativdlg"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\nativdlg\"
ObjectFile="vc_mswunivuddll\nativdlg\"
ProgramDataBaseFileName="vc_mswunivuddll\nativdlg.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\nativdlg.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\nativdlg.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\nativdlg_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\nativdlg"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\nativdlg\"
ObjectFile="vc_mswudll\nativdlg\"
ProgramDataBaseFileName="vc_mswudll\nativdlg.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\nativdlg.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\nativdlg.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\nativdlg_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\nativdlg"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\nativdlg\"
ObjectFile="vc_mswuddll\nativdlg\"
ProgramDataBaseFileName="vc_mswuddll\nativdlg.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\nativdlg.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\nativdlg.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\nativdlg_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\nativdlg"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\nativdlg\"
ObjectFile="vc_mswunivu\nativdlg\"
ProgramDataBaseFileName="vc_mswunivu\nativdlg.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\nativdlg.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\nativdlg.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\nativdlg_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\nativdlg"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\nativdlg\"
ObjectFile="vc_mswunivud\nativdlg\"
ProgramDataBaseFileName="vc_mswunivud\nativdlg.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\nativdlg.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\nativdlg.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\nativdlg_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\nativdlg"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\nativdlg\"
ObjectFile="vc_mswu\nativdlg\"
ProgramDataBaseFileName="vc_mswu\nativdlg.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\nativdlg.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\nativdlg.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\nativdlg_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\nativdlg"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\nativdlg\"
ObjectFile="vc_mswud\nativdlg\"
ProgramDataBaseFileName="vc_mswud\nativdlg.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\nativdlg.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\nativdlg.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\nativdlg_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\nativdlg.cpp"/>
+ RelativePath=".\nativdlg.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\nativdlg.rc"/>
+ RelativePath=".\nativdlg.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/nativdlg/nativdlg_vc8.vcproj b/samples/nativdlg/nativdlg_vc8.vcproj
index d06e4ae2dd..314a9428a1 100644
--- a/samples/nativdlg/nativdlg_vc8.vcproj
+++ b/samples/nativdlg/nativdlg_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\nativdlg\"
ObjectFile="vc_mswunivudll\nativdlg\"
ProgramDataBaseFileName="vc_mswunivudll\nativdlg.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\nativdlg.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\nativdlg.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\nativdlg\"
ObjectFile="vc_mswunivuddll\nativdlg\"
ProgramDataBaseFileName="vc_mswunivuddll\nativdlg.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\nativdlg.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\nativdlg.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\nativdlg\"
ObjectFile="vc_mswudll\nativdlg\"
ProgramDataBaseFileName="vc_mswudll\nativdlg.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\nativdlg.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\nativdlg.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\nativdlg\"
ObjectFile="vc_mswuddll\nativdlg\"
ProgramDataBaseFileName="vc_mswuddll\nativdlg.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\nativdlg.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\nativdlg.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\nativdlg\"
ObjectFile="vc_mswunivu\nativdlg\"
ProgramDataBaseFileName="vc_mswunivu\nativdlg.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\nativdlg.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\nativdlg.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\nativdlg\"
ObjectFile="vc_mswunivud\nativdlg\"
ProgramDataBaseFileName="vc_mswunivud\nativdlg.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\nativdlg.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\nativdlg.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\nativdlg\"
ObjectFile="vc_mswu\nativdlg\"
ProgramDataBaseFileName="vc_mswu\nativdlg.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\nativdlg.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\nativdlg.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\nativdlg\"
ObjectFile="vc_mswud\nativdlg\"
ProgramDataBaseFileName="vc_mswud\nativdlg.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\nativdlg.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\nativdlg.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\nativdlg.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\nativdlg.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in
index 808b90e56a..84453c84ad 100644
--- a/samples/notebook/Makefile.in
+++ b/samples/notebook/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ NOTEBOOK_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: notebook$(EXEEXT) $(__notebook_bundle___depname)
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
notebook$(EXEEXT): $(NOTEBOOK_OBJECTS) $(__notebook___win32rc)
- $(CXX) -o $@ $(NOTEBOOK_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(NOTEBOOK_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)
$(__notebook___mac_setfilecmd)
$(__notebook___os2_emxbindcmd)
@@ -192,6 +192,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean notebook_bundle
diff --git a/samples/notebook/makefile.bcc b/samples/notebook/makefile.bcc
index f7a6b2cdb5..9df3aaea40 100644
--- a/samples/notebook/makefile.bcc
+++ b/samples/notebook/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\notebook.ils del $(OBJS)\notebook.ils
$(OBJS)\notebook.exe: $(NOTEBOOK_OBJECTS) $(OBJS)\notebook_sample.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/notebook/makefile.gcc b/samples/notebook/makefile.gcc
index f87e7b8adf..0de1163540 100644
--- a/samples/notebook/makefile.gcc
+++ b/samples/notebook/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\notebook.exe del $(OBJS)\notebook.exe
$(OBJS)\notebook.exe: $(NOTEBOOK_OBJECTS) $(OBJS)\notebook_sample_rc.o
- $(CXX) -o $@ $(NOTEBOOK_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(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
diff --git a/samples/notebook/makefile.unx b/samples/notebook/makefile.unx
index 9c27d85954..68b04c58fe 100644
--- a/samples/notebook/makefile.unx
+++ b/samples/notebook/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild notebook
-install: all
+install:
uninstall:
diff --git a/samples/notebook/makefile.vc b/samples/notebook/makefile.vc
index 5fa9b25a8a..782e047041 100644
--- a/samples/notebook/makefile.vc
+++ b/samples/notebook/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\notebook.pdb del $(OBJS)\notebook.pdb
$(OBJS)\notebook.exe: $(NOTEBOOK_OBJECTS) $(OBJS)\notebook_sample.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\notebook.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\notebook.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/notebook/makefile.wat b/samples/notebook/makefile.wat
index 1b834cd24f..69404c9368 100644
--- a/samples/notebook/makefile.wat
+++ b/samples/notebook/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\notebook.exe : $(NOTEBOOK_OBJECTS) $(OBJS)\notebook_sample.res
@%append $(OBJS)\notebook.lbc option quiet
@%append $(OBJS)\notebook.lbc name $^@
@%append $(OBJS)\notebook.lbc option caseexact
- @%append $(OBJS)\notebook.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\notebook.lbc library %i
@%append $(OBJS)\notebook.lbc option resource=$(OBJS)\notebook_sample.res
diff --git a/samples/notebook/notebook_vc7.vcproj b/samples/notebook/notebook_vc7.vcproj
index 4738fb8deb..87ff495511 100644
--- a/samples/notebook/notebook_vc7.vcproj
+++ b/samples/notebook/notebook_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\notebook"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\notebook\"
ObjectFile="vc_mswunivudll\notebook\"
ProgramDataBaseFileName="vc_mswunivudll\notebook.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\notebook.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\notebook.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\notebook_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\notebook"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\notebook\"
ObjectFile="vc_mswunivuddll\notebook\"
ProgramDataBaseFileName="vc_mswunivuddll\notebook.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\notebook.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\notebook.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\notebook_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\notebook"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\notebook\"
ObjectFile="vc_mswudll\notebook\"
ProgramDataBaseFileName="vc_mswudll\notebook.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\notebook.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\notebook.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\notebook_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\notebook"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\notebook\"
ObjectFile="vc_mswuddll\notebook\"
ProgramDataBaseFileName="vc_mswuddll\notebook.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\notebook.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\notebook.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\notebook_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\notebook"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\notebook\"
ObjectFile="vc_mswunivu\notebook\"
ProgramDataBaseFileName="vc_mswunivu\notebook.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\notebook.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\notebook.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\notebook_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\notebook"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\notebook\"
ObjectFile="vc_mswunivud\notebook\"
ProgramDataBaseFileName="vc_mswunivud\notebook.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\notebook.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\notebook.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\notebook_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\notebook"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\notebook\"
ObjectFile="vc_mswu\notebook\"
ProgramDataBaseFileName="vc_mswu\notebook.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\notebook.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\notebook.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\notebook_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\notebook"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\notebook\"
ObjectFile="vc_mswud\notebook\"
ProgramDataBaseFileName="vc_mswud\notebook.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\notebook.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\notebook.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\notebook_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\notebook.cpp"/>
+ RelativePath=".\notebook.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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"/>
+ RelativePath=".\..\..\samples\sample.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/notebook/notebook_vc8.vcproj b/samples/notebook/notebook_vc8.vcproj
index 49796ffd3b..1934d0f136 100644
--- a/samples/notebook/notebook_vc8.vcproj
+++ b/samples/notebook/notebook_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\notebook\"
ObjectFile="vc_mswunivudll\notebook\"
ProgramDataBaseFileName="vc_mswunivudll\notebook.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\notebook.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\notebook.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\notebook\"
ObjectFile="vc_mswunivuddll\notebook\"
ProgramDataBaseFileName="vc_mswunivuddll\notebook.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\notebook.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\notebook.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\notebook\"
ObjectFile="vc_mswudll\notebook\"
ProgramDataBaseFileName="vc_mswudll\notebook.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\notebook.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\notebook.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\notebook\"
ObjectFile="vc_mswuddll\notebook\"
ProgramDataBaseFileName="vc_mswuddll\notebook.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\notebook.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\notebook.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\notebook\"
ObjectFile="vc_mswunivu\notebook\"
ProgramDataBaseFileName="vc_mswunivu\notebook.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\notebook.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\notebook.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\notebook\"
ObjectFile="vc_mswunivud\notebook\"
ProgramDataBaseFileName="vc_mswunivud\notebook.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\notebook.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\notebook.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\notebook\"
ObjectFile="vc_mswu\notebook\"
ProgramDataBaseFileName="vc_mswu\notebook.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\notebook.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\notebook.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\notebook\"
ObjectFile="vc_mswud\notebook\"
ProgramDataBaseFileName="vc_mswud\notebook.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\notebook.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\notebook.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\notebook.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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>
diff --git a/samples/oleauto/Makefile.in b/samples/oleauto/Makefile.in
index 3f8547d51a..4af11ed98c 100644
--- a/samples/oleauto/Makefile.in
+++ b/samples/oleauto/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ OLEAUTO_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: oleauto$(EXEEXT) $(__oleauto_bundle___depname)
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
oleauto$(EXEEXT): $(OLEAUTO_OBJECTS) $(__oleauto___win32rc)
- $(CXX) -o $@ $(OLEAUTO_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(OLEAUTO_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)
$(__oleauto___mac_setfilecmd)
$(__oleauto___os2_emxbindcmd)
@@ -192,6 +192,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean oleauto_bundle
diff --git a/samples/oleauto/makefile.bcc b/samples/oleauto/makefile.bcc
index 2a8cdea5ff..25174f3bed 100644
--- a/samples/oleauto/makefile.bcc
+++ b/samples/oleauto/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\oleauto.ils del $(OBJS)\oleauto.ils
$(OBJS)\oleauto.exe: $(OLEAUTO_OBJECTS) $(OBJS)\oleauto_oleauto.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/oleauto/makefile.gcc b/samples/oleauto/makefile.gcc
index e1f3441edc..72871d7c58 100644
--- a/samples/oleauto/makefile.gcc
+++ b/samples/oleauto/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\oleauto.exe del $(OBJS)\oleauto.exe
$(OBJS)\oleauto.exe: $(OLEAUTO_OBJECTS) $(OBJS)\oleauto_oleauto_rc.o
- $(CXX) -o $@ $(OLEAUTO_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(OBJS)\oleauto_oleauto.o: ./oleauto.cpp
$(CXX) -c -o $@ $(OLEAUTO_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/oleauto/makefile.unx b/samples/oleauto/makefile.unx
index 08ada2ab0d..cd7492dddb 100644
--- a/samples/oleauto/makefile.unx
+++ b/samples/oleauto/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild oleauto
-install: all
+install:
uninstall:
diff --git a/samples/oleauto/makefile.vc b/samples/oleauto/makefile.vc
index 5ed8cc6851..d74c86328b 100644
--- a/samples/oleauto/makefile.vc
+++ b/samples/oleauto/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\oleauto.pdb del $(OBJS)\oleauto.pdb
$(OBJS)\oleauto.exe: $(OLEAUTO_OBJECTS) $(OBJS)\oleauto_oleauto.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\oleauto.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\oleauto.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/oleauto/makefile.wat b/samples/oleauto/makefile.wat
index 102c444372..ee1955fe6d 100644
--- a/samples/oleauto/makefile.wat
+++ b/samples/oleauto/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\oleauto.exe : $(OLEAUTO_OBJECTS) $(OBJS)\oleauto_oleauto.res
@%append $(OBJS)\oleauto.lbc option quiet
@%append $(OBJS)\oleauto.lbc name $^@
@%append $(OBJS)\oleauto.lbc option caseexact
- @%append $(OBJS)\oleauto.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\oleauto.lbc library %i
@%append $(OBJS)\oleauto.lbc option resource=$(OBJS)\oleauto_oleauto.res
diff --git a/samples/oleauto/oleauto_vc7.vcproj b/samples/oleauto/oleauto_vc7.vcproj
index 7855f19f0d..5c94c3d8a8 100644
--- a/samples/oleauto/oleauto_vc7.vcproj
+++ b/samples/oleauto/oleauto_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\oleauto"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\oleauto\"
ObjectFile="vc_mswunivudll\oleauto\"
ProgramDataBaseFileName="vc_mswunivudll\oleauto.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\oleauto.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\oleauto.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\oleauto_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\oleauto"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\oleauto\"
ObjectFile="vc_mswunivuddll\oleauto\"
ProgramDataBaseFileName="vc_mswunivuddll\oleauto.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\oleauto.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\oleauto.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\oleauto_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\oleauto"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\oleauto\"
ObjectFile="vc_mswudll\oleauto\"
ProgramDataBaseFileName="vc_mswudll\oleauto.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\oleauto.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\oleauto.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\oleauto_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\oleauto"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\oleauto\"
ObjectFile="vc_mswuddll\oleauto\"
ProgramDataBaseFileName="vc_mswuddll\oleauto.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\oleauto.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\oleauto.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\oleauto_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\oleauto"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\oleauto\"
ObjectFile="vc_mswunivu\oleauto\"
ProgramDataBaseFileName="vc_mswunivu\oleauto.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\oleauto.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\oleauto.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\oleauto_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\oleauto"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\oleauto\"
ObjectFile="vc_mswunivud\oleauto\"
ProgramDataBaseFileName="vc_mswunivud\oleauto.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\oleauto.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\oleauto.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\oleauto_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\oleauto"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\oleauto\"
ObjectFile="vc_mswu\oleauto\"
ProgramDataBaseFileName="vc_mswu\oleauto.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\oleauto.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\oleauto.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\oleauto_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\oleauto"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\oleauto\"
ObjectFile="vc_mswud\oleauto\"
ProgramDataBaseFileName="vc_mswud\oleauto.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\oleauto.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\oleauto.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\oleauto_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\oleauto.cpp"/>
+ RelativePath=".\oleauto.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\oleauto.rc"/>
+ RelativePath=".\oleauto.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/oleauto/oleauto_vc8.vcproj b/samples/oleauto/oleauto_vc8.vcproj
index 173d38505d..33d57ed407 100644
--- a/samples/oleauto/oleauto_vc8.vcproj
+++ b/samples/oleauto/oleauto_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\oleauto\"
ObjectFile="vc_mswunivudll\oleauto\"
ProgramDataBaseFileName="vc_mswunivudll\oleauto.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\oleauto.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\oleauto.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\oleauto\"
ObjectFile="vc_mswunivuddll\oleauto\"
ProgramDataBaseFileName="vc_mswunivuddll\oleauto.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\oleauto.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\oleauto.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\oleauto\"
ObjectFile="vc_mswudll\oleauto\"
ProgramDataBaseFileName="vc_mswudll\oleauto.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\oleauto.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\oleauto.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\oleauto\"
ObjectFile="vc_mswuddll\oleauto\"
ProgramDataBaseFileName="vc_mswuddll\oleauto.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\oleauto.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\oleauto.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\oleauto\"
ObjectFile="vc_mswunivu\oleauto\"
ProgramDataBaseFileName="vc_mswunivu\oleauto.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\oleauto.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\oleauto.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\oleauto\"
ObjectFile="vc_mswunivud\oleauto\"
ProgramDataBaseFileName="vc_mswunivud\oleauto.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\oleauto.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\oleauto.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\oleauto\"
ObjectFile="vc_mswu\oleauto\"
ProgramDataBaseFileName="vc_mswu\oleauto.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\oleauto.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\oleauto.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\oleauto\"
ObjectFile="vc_mswud\oleauto\"
ProgramDataBaseFileName="vc_mswud\oleauto.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\oleauto.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\oleauto.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\oleauto.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\oleauto.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/opengl/Makefile.in b/samples/opengl/Makefile.in
index 5f8b510719..73ea7574ad 100644
--- a/samples/opengl/Makefile.in
+++ b/samples/opengl/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -23,7 +23,7 @@ DESTDIR =
all: cube isosurf penguin
-install: all
+install:
uninstall:
@@ -53,6 +53,6 @@ penguin:
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean cube isosurf penguin
diff --git a/samples/opengl/cube/Makefile.in b/samples/opengl/cube/Makefile.in
index d486d5a97f..d8691a48f4 100644
--- a/samples/opengl/cube/Makefile.in
+++ b/samples/opengl/cube/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -60,7 +60,7 @@ CUBE_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -112,28 +112,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: $(__cube___depname) $(__cube_bundle___depname)
-install: all
+install:
uninstall:
@@ -149,7 +149,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
@COND_USE_OPENGL_1@cube$(EXEEXT): $(CUBE_OBJECTS) $(__cube___win32rc)
-@COND_USE_OPENGL_1@ $(CXX) -o $@ $(CUBE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__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)
+@COND_USE_OPENGL_1@ $(CXX) -o $@ $(CUBE_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__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)
@COND_USE_OPENGL_1@
@COND_USE_OPENGL_1@ $(__cube___mac_setfilecmd)
@COND_USE_OPENGL_1@ $(__cube___os2_emxbindcmd)
@@ -194,6 +194,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean cube_bundle
diff --git a/samples/opengl/cube/cube_vc7.vcproj b/samples/opengl/cube/cube_vc7.vcproj
index 4f6fd07f3a..d2acce8b8b 100644
--- a/samples/opengl/cube/cube_vc7.vcproj
+++ b/samples/opengl/cube/cube_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\cube"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\cube\"
ObjectFile="vc_mswunivudll\cube\"
ProgramDataBaseFileName="vc_mswunivudll\cube.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\cube.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\cube.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\cube_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\cube"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\cube\"
ObjectFile="vc_mswunivuddll\cube\"
ProgramDataBaseFileName="vc_mswunivuddll\cube.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_gl.lib opengl32.lib glu32.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_gl.lib opengl32.lib glu32.lib 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"
OutputFile="vc_mswunivuddll\cube.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\cube.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\cube_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\cube"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\cube\"
ObjectFile="vc_mswudll\cube\"
ProgramDataBaseFileName="vc_mswudll\cube.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\cube.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\cube.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\cube_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\cube"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\cube\"
ObjectFile="vc_mswuddll\cube\"
ProgramDataBaseFileName="vc_mswuddll\cube.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_gl.lib opengl32.lib glu32.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_gl.lib opengl32.lib glu32.lib 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"
OutputFile="vc_mswuddll\cube.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\cube.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\cube_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\cube"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\cube\"
ObjectFile="vc_mswunivu\cube\"
ProgramDataBaseFileName="vc_mswunivu\cube.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\cube.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\cube.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\cube_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\cube"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\cube\"
ObjectFile="vc_mswunivud\cube\"
ProgramDataBaseFileName="vc_mswunivud\cube.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_gl.lib opengl32.lib glu32.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_gl.lib opengl32.lib glu32.lib 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"
OutputFile="vc_mswunivud\cube.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\cube.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\cube_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\cube"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\cube\"
ObjectFile="vc_mswu\cube\"
ProgramDataBaseFileName="vc_mswu\cube.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\cube.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\cube.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\cube_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\cube"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\cube\"
ObjectFile="vc_mswud\cube\"
ProgramDataBaseFileName="vc_mswud\cube.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_gl.lib opengl32.lib glu32.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_gl.lib opengl32.lib glu32.lib 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"
OutputFile="vc_mswud\cube.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\cube.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\cube_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\cube.cpp"/>
+ RelativePath=".\cube.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\cube.rc"/>
+ RelativePath=".\cube.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/opengl/cube/cube_vc8.vcproj b/samples/opengl/cube/cube_vc8.vcproj
index 06dcec1fc1..7e5f9cb89b 100644
--- a/samples/opengl/cube/cube_vc8.vcproj
+++ b/samples/opengl/cube/cube_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\cube\"
ObjectFile="vc_mswunivudll\cube\"
ProgramDataBaseFileName="vc_mswunivudll\cube.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\cube.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\cube.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\cube\"
ObjectFile="vc_mswunivuddll\cube\"
ProgramDataBaseFileName="vc_mswunivuddll\cube.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_gl.lib opengl32.lib glu32.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_gl.lib opengl32.lib glu32.lib 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"
OutputFile="vc_mswunivuddll\cube.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\cube.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\cube\"
ObjectFile="vc_mswudll\cube\"
ProgramDataBaseFileName="vc_mswudll\cube.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\cube.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\cube.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\cube\"
ObjectFile="vc_mswuddll\cube\"
ProgramDataBaseFileName="vc_mswuddll\cube.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_gl.lib opengl32.lib glu32.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_gl.lib opengl32.lib glu32.lib 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"
OutputFile="vc_mswuddll\cube.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\cube.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\cube\"
ObjectFile="vc_mswunivu\cube\"
ProgramDataBaseFileName="vc_mswunivu\cube.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\cube.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\cube.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\cube\"
ObjectFile="vc_mswunivud\cube\"
ProgramDataBaseFileName="vc_mswunivud\cube.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_gl.lib opengl32.lib glu32.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_gl.lib opengl32.lib glu32.lib 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"
OutputFile="vc_mswunivud\cube.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\cube.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\cube\"
ObjectFile="vc_mswu\cube\"
ProgramDataBaseFileName="vc_mswu\cube.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\cube.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\cube.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\cube\"
ObjectFile="vc_mswud\cube\"
ProgramDataBaseFileName="vc_mswud\cube.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_gl.lib opengl32.lib glu32.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_gl.lib opengl32.lib glu32.lib 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"
OutputFile="vc_mswud\cube.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\cube.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\cube.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\cube.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/opengl/cube/makefile.bcc b/samples/opengl/cube/makefile.bcc
index a75d07ecd8..0ef8f3829e 100644
--- a/samples/opengl/cube/makefile.bcc
+++ b/samples/opengl/cube/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -233,7 +233,7 @@ clean:
!if "$(USE_OPENGL)" == "1"
$(OBJS)\cube.exe: $(CUBE_OBJECTS) $(OBJS)\cube_cube.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
diff --git a/samples/opengl/cube/makefile.gcc b/samples/opengl/cube/makefile.gcc
index 2eebac764d..8bb8f31ac3 100644
--- a/samples/opengl/cube/makefile.gcc
+++ b/samples/opengl/cube/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -228,7 +228,7 @@ clean:
ifeq ($(USE_OPENGL),1)
$(OBJS)\cube.exe: $(CUBE_OBJECTS) $(OBJS)\cube_cube_rc.o
- $(CXX) -o $@ $(CUBE_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -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
+ $(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
endif
$(OBJS)\cube_cube.o: ./cube.cpp
diff --git a/samples/opengl/cube/makefile.unx b/samples/opengl/cube/makefile.unx
index 0d913b9a7e..bb171b6cde 100644
--- a/samples/opengl/cube/makefile.unx
+++ b/samples/opengl/cube/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild cube
-install: all
+install:
uninstall:
diff --git a/samples/opengl/cube/makefile.vc b/samples/opengl/cube/makefile.vc
index c77862bb19..88cd641243 100644
--- a/samples/opengl/cube/makefile.vc
+++ b/samples/opengl/cube/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -309,7 +309,7 @@ clean:
!if "$(USE_OPENGL)" == "1"
$(OBJS)\cube.exe: $(CUBE_OBJECTS) $(OBJS)\cube_cube.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\cube.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\cube.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
!endif
diff --git a/samples/opengl/cube/makefile.wat b/samples/opengl/cube/makefile.wat
index 1761989311..366594f228 100644
--- a/samples/opengl/cube/makefile.wat
+++ b/samples/opengl/cube/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -256,7 +256,7 @@ $(OBJS)\cube.exe : $(CUBE_OBJECTS) $(OBJS)\cube_cube.res
@%append $(OBJS)\cube.lbc option quiet
@%append $(OBJS)\cube.lbc name $^@
@%append $(OBJS)\cube.lbc option caseexact
- @%append $(OBJS)\cube.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\cube.lbc library %i
@%append $(OBJS)\cube.lbc option resource=$(OBJS)\cube_cube.res
diff --git a/samples/opengl/isosurf/Makefile.in b/samples/opengl/isosurf/Makefile.in
index e70dce8c6a..38d64017fb 100644
--- a/samples/opengl/isosurf/Makefile.in
+++ b/samples/opengl/isosurf/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -60,7 +60,7 @@ ISOSURF_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -113,28 +113,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: $(__isosurf___depname) $(__isosurf_bundle___depname) data
-install: all
+install:
uninstall:
@@ -150,7 +150,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
@COND_USE_OPENGL_1@isosurf$(EXEEXT): $(ISOSURF_OBJECTS) $(__isosurf___win32rc)
-@COND_USE_OPENGL_1@ $(CXX) -o $@ $(ISOSURF_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__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)
+@COND_USE_OPENGL_1@ $(CXX) -o $@ $(ISOSURF_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__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)
@COND_USE_OPENGL_1@
@COND_USE_OPENGL_1@ $(__isosurf___mac_setfilecmd)
@COND_USE_OPENGL_1@ $(__isosurf___os2_emxbindcmd)
@@ -207,6 +207,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean isosurf_bundle data
diff --git a/samples/opengl/isosurf/isosurf_vc7.vcproj b/samples/opengl/isosurf/isosurf_vc7.vcproj
index f8595d0070..2e3c10cbf7 100644
--- a/samples/opengl/isosurf/isosurf_vc7.vcproj
+++ b/samples/opengl/isosurf/isosurf_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\isosurf"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\isosurf\"
ObjectFile="vc_mswunivudll\isosurf\"
ProgramDataBaseFileName="vc_mswunivudll\isosurf.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\isosurf.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\isosurf.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\isosurf_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\isosurf"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\isosurf\"
ObjectFile="vc_mswunivuddll\isosurf\"
ProgramDataBaseFileName="vc_mswunivuddll\isosurf.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_gl.lib opengl32.lib glu32.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_gl.lib opengl32.lib glu32.lib 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"
OutputFile="vc_mswunivuddll\isosurf.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\isosurf.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\isosurf_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\isosurf"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\isosurf\"
ObjectFile="vc_mswudll\isosurf\"
ProgramDataBaseFileName="vc_mswudll\isosurf.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\isosurf.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\isosurf.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\isosurf_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\isosurf"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\isosurf\"
ObjectFile="vc_mswuddll\isosurf\"
ProgramDataBaseFileName="vc_mswuddll\isosurf.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_gl.lib opengl32.lib glu32.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_gl.lib opengl32.lib glu32.lib 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"
OutputFile="vc_mswuddll\isosurf.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\isosurf.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\isosurf_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\isosurf"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\isosurf\"
ObjectFile="vc_mswunivu\isosurf\"
ProgramDataBaseFileName="vc_mswunivu\isosurf.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\isosurf.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\isosurf.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\isosurf_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\isosurf"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\isosurf\"
ObjectFile="vc_mswunivud\isosurf\"
ProgramDataBaseFileName="vc_mswunivud\isosurf.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_gl.lib opengl32.lib glu32.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_gl.lib opengl32.lib glu32.lib 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"
OutputFile="vc_mswunivud\isosurf.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\isosurf.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\isosurf_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\isosurf"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\isosurf\"
ObjectFile="vc_mswu\isosurf\"
ProgramDataBaseFileName="vc_mswu\isosurf.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\isosurf.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\isosurf.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\isosurf_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\isosurf"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\isosurf\"
ObjectFile="vc_mswud\isosurf\"
ProgramDataBaseFileName="vc_mswud\isosurf.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_gl.lib opengl32.lib glu32.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_gl.lib opengl32.lib glu32.lib 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"
OutputFile="vc_mswud\isosurf.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\isosurf.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\isosurf_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\isosurf.cpp"/>
+ RelativePath=".\isosurf.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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"/>
+ RelativePath=".\..\..\..\samples\sample.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/opengl/isosurf/isosurf_vc8.vcproj b/samples/opengl/isosurf/isosurf_vc8.vcproj
index 7b35be38ee..25e1990028 100644
--- a/samples/opengl/isosurf/isosurf_vc8.vcproj
+++ b/samples/opengl/isosurf/isosurf_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\isosurf\"
ObjectFile="vc_mswunivudll\isosurf\"
ProgramDataBaseFileName="vc_mswunivudll\isosurf.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\isosurf.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\isosurf.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\isosurf\"
ObjectFile="vc_mswunivuddll\isosurf\"
ProgramDataBaseFileName="vc_mswunivuddll\isosurf.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_gl.lib opengl32.lib glu32.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_gl.lib opengl32.lib glu32.lib 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"
OutputFile="vc_mswunivuddll\isosurf.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\isosurf.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\isosurf\"
ObjectFile="vc_mswudll\isosurf\"
ProgramDataBaseFileName="vc_mswudll\isosurf.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\isosurf.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\isosurf.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\isosurf\"
ObjectFile="vc_mswuddll\isosurf\"
ProgramDataBaseFileName="vc_mswuddll\isosurf.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_gl.lib opengl32.lib glu32.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_gl.lib opengl32.lib glu32.lib 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"
OutputFile="vc_mswuddll\isosurf.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\isosurf.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\isosurf\"
ObjectFile="vc_mswunivu\isosurf\"
ProgramDataBaseFileName="vc_mswunivu\isosurf.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\isosurf.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\isosurf.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\isosurf\"
ObjectFile="vc_mswunivud\isosurf\"
ProgramDataBaseFileName="vc_mswunivud\isosurf.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_gl.lib opengl32.lib glu32.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_gl.lib opengl32.lib glu32.lib 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"
OutputFile="vc_mswunivud\isosurf.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\isosurf.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\isosurf\"
ObjectFile="vc_mswu\isosurf\"
ProgramDataBaseFileName="vc_mswu\isosurf.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\isosurf.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\isosurf.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\isosurf\"
ObjectFile="vc_mswud\isosurf\"
ProgramDataBaseFileName="vc_mswud\isosurf.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_gl.lib opengl32.lib glu32.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_gl.lib opengl32.lib glu32.lib 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"
OutputFile="vc_mswud\isosurf.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\isosurf.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\isosurf.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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>
diff --git a/samples/opengl/isosurf/makefile.bcc b/samples/opengl/isosurf/makefile.bcc
index ecb42b0271..bbd97c2db6 100644
--- a/samples/opengl/isosurf/makefile.bcc
+++ b/samples/opengl/isosurf/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -233,7 +233,7 @@ clean:
!if "$(USE_OPENGL)" == "1"
$(OBJS)\isosurf.exe: $(ISOSURF_OBJECTS) $(OBJS)\isosurf_sample.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
diff --git a/samples/opengl/isosurf/makefile.gcc b/samples/opengl/isosurf/makefile.gcc
index 961d3de696..3f620f128c 100644
--- a/samples/opengl/isosurf/makefile.gcc
+++ b/samples/opengl/isosurf/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -228,7 +228,7 @@ clean:
ifeq ($(USE_OPENGL),1)
$(OBJS)\isosurf.exe: $(ISOSURF_OBJECTS) $(OBJS)\isosurf_sample_rc.o
- $(CXX) -o $@ $(ISOSURF_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -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
+ $(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
endif
data:
diff --git a/samples/opengl/isosurf/makefile.unx b/samples/opengl/isosurf/makefile.unx
index dc37bb37f2..c2b2829cf2 100644
--- a/samples/opengl/isosurf/makefile.unx
+++ b/samples/opengl/isosurf/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild isosurf
-install: all
+install:
uninstall:
diff --git a/samples/opengl/isosurf/makefile.vc b/samples/opengl/isosurf/makefile.vc
index f29e27dab2..ff34e5a30d 100644
--- a/samples/opengl/isosurf/makefile.vc
+++ b/samples/opengl/isosurf/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -309,7 +309,7 @@ clean:
!if "$(USE_OPENGL)" == "1"
$(OBJS)\isosurf.exe: $(ISOSURF_OBJECTS) $(OBJS)\isosurf_sample.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\isosurf.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\isosurf.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
!endif
diff --git a/samples/opengl/isosurf/makefile.wat b/samples/opengl/isosurf/makefile.wat
index 22c9ca3903..65b4ef6784 100644
--- a/samples/opengl/isosurf/makefile.wat
+++ b/samples/opengl/isosurf/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -256,7 +256,7 @@ $(OBJS)\isosurf.exe : $(ISOSURF_OBJECTS) $(OBJS)\isosurf_sample.res
@%append $(OBJS)\isosurf.lbc option quiet
@%append $(OBJS)\isosurf.lbc name $^@
@%append $(OBJS)\isosurf.lbc option caseexact
- @%append $(OBJS)\isosurf.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\isosurf.lbc library %i
@%append $(OBJS)\isosurf.lbc option resource=$(OBJS)\isosurf_sample.res
diff --git a/samples/opengl/makefile.bcc b/samples/opengl/makefile.bcc
index a0326e9902..82b8274fb1 100644
--- a/samples/opengl/makefile.bcc
+++ b/samples/opengl/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -28,8 +28,9 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
-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_RICHTEXT="$(USE_RICHTEXT)" \
- -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \
+ -DUSE_AUI="$(USE_AUI)" -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)" \
diff --git a/samples/opengl/makefile.gcc b/samples/opengl/makefile.gcc
index 71761c0c80..96d71e281b 100644
--- a/samples/opengl/makefile.gcc
+++ b/samples/opengl/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -20,8 +20,8 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
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_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
- USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
+ 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)" \
diff --git a/samples/opengl/makefile.unx b/samples/opengl/makefile.unx
index ee8d8ec867..3db76a9528 100644
--- a/samples/opengl/makefile.unx
+++ b/samples/opengl/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -27,7 +27,7 @@
all: cube isosurf penguin
-install: all
+install:
uninstall:
diff --git a/samples/opengl/makefile.vc b/samples/opengl/makefile.vc
index 2791846a47..d201314ed3 100644
--- a/samples/opengl/makefile.vc
+++ b/samples/opengl/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -19,8 +19,8 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
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_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
- USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
+ 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)" \
diff --git a/samples/opengl/makefile.wat b/samples/opengl/makefile.wat
index 99b7a8df2c..9df34beb5e 100644
--- a/samples/opengl/makefile.wat
+++ b/samples/opengl/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -36,8 +36,8 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
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_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" &
- USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" &
+ 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)" &
diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in
index e9705e8871..36bf8ff0fc 100644
--- a/samples/opengl/penguin/Makefile.in
+++ b/samples/opengl/penguin/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -70,7 +70,7 @@ PENGUIN_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -123,28 +123,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: $(__penguin___depname) $(__penguin_bundle___depname) data
-install: all
+install:
uninstall:
@@ -160,7 +160,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
@COND_USE_OPENGL_1@penguin$(EXEEXT): $(PENGUIN_OBJECTS) $(__penguin___win32rc)
-@COND_USE_OPENGL_1@ $(CXX) -o $@ $(PENGUIN_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__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)
+@COND_USE_OPENGL_1@ $(CXX) -o $@ $(PENGUIN_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__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)
@COND_USE_OPENGL_1@
@COND_USE_OPENGL_1@ $(__penguin___mac_setfilecmd)
@COND_USE_OPENGL_1@ $(__penguin___os2_emxbindcmd)
@@ -223,6 +223,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean penguin_bundle data
diff --git a/samples/opengl/penguin/makefile.bcc b/samples/opengl/penguin/makefile.bcc
index efc712ba04..2d873c1ae6 100644
--- a/samples/opengl/penguin/makefile.bcc
+++ b/samples/opengl/penguin/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -241,7 +241,7 @@ clean:
!if "$(USE_OPENGL)" == "1"
$(OBJS)\penguin.exe: $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
diff --git a/samples/opengl/penguin/makefile.gcc b/samples/opengl/penguin/makefile.gcc
index c10b96d944..bd09ff1ea8 100644
--- a/samples/opengl/penguin/makefile.gcc
+++ b/samples/opengl/penguin/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -236,7 +236,7 @@ clean:
ifeq ($(USE_OPENGL),1)
$(OBJS)\penguin.exe: $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin_rc.o
- $(CXX) -o $@ $(PENGUIN_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -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
+ $(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
endif
data:
diff --git a/samples/opengl/penguin/makefile.unx b/samples/opengl/penguin/makefile.unx
index 876b8711b3..90fe20d0f3 100644
--- a/samples/opengl/penguin/makefile.unx
+++ b/samples/opengl/penguin/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,40 +11,40 @@
# -------------------------------------------------------------------------
# C compiler
-CC := gcc
+CC ?= gcc
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for CC
-CFLAGS :=
+CFLAGS ?=
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -95,7 +95,7 @@ endif
all: test_for_selected_wxbuild penguin
-install: all
+install:
uninstall:
diff --git a/samples/opengl/penguin/makefile.vc b/samples/opengl/penguin/makefile.vc
index f44b54f311..a1b6e45fad 100644
--- a/samples/opengl/penguin/makefile.vc
+++ b/samples/opengl/penguin/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -61,18 +61,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -82,18 +82,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -318,7 +318,7 @@ clean:
!if "$(USE_OPENGL)" == "1"
$(OBJS)\penguin.exe: $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\penguin.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\penguin.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
!endif
diff --git a/samples/opengl/penguin/makefile.wat b/samples/opengl/penguin/makefile.wat
index c78d393a1a..84a44da227 100644
--- a/samples/opengl/penguin/makefile.wat
+++ b/samples/opengl/penguin/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -264,7 +264,7 @@ $(OBJS)\penguin.exe : $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin.res
@%append $(OBJS)\penguin.lbc option quiet
@%append $(OBJS)\penguin.lbc name $^@
@%append $(OBJS)\penguin.lbc option caseexact
- @%append $(OBJS)\penguin.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\penguin.lbc library %i
@%append $(OBJS)\penguin.lbc option resource=$(OBJS)\penguin_penguin.res
diff --git a/samples/opengl/penguin/penguin_vc7.vcproj b/samples/opengl/penguin/penguin_vc7.vcproj
index 5dc9c34774..64fc34d69f 100644
--- a/samples/opengl/penguin/penguin_vc7.vcproj
+++ b/samples/opengl/penguin/penguin_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\penguin"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\penguin\"
ObjectFile="vc_mswunivudll\penguin\"
ProgramDataBaseFileName="vc_mswunivudll\penguin.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\penguin.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\penguin.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\penguin_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\penguin"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\penguin\"
ObjectFile="vc_mswunivuddll\penguin\"
ProgramDataBaseFileName="vc_mswunivuddll\penguin.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_gl.lib opengl32.lib glu32.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_gl.lib opengl32.lib glu32.lib 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"
OutputFile="vc_mswunivuddll\penguin.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\penguin.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\penguin_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\penguin"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\penguin\"
ObjectFile="vc_mswudll\penguin\"
ProgramDataBaseFileName="vc_mswudll\penguin.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\penguin.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\penguin.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\penguin_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\penguin"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\penguin\"
ObjectFile="vc_mswuddll\penguin\"
ProgramDataBaseFileName="vc_mswuddll\penguin.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_gl.lib opengl32.lib glu32.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_gl.lib opengl32.lib glu32.lib 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"
OutputFile="vc_mswuddll\penguin.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\penguin.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\penguin_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\penguin"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\penguin\"
ObjectFile="vc_mswunivu\penguin\"
ProgramDataBaseFileName="vc_mswunivu\penguin.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\penguin.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\penguin.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\penguin_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\penguin"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\penguin\"
ObjectFile="vc_mswunivud\penguin\"
ProgramDataBaseFileName="vc_mswunivud\penguin.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_gl.lib opengl32.lib glu32.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_gl.lib opengl32.lib glu32.lib 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"
OutputFile="vc_mswunivud\penguin.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\penguin.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\penguin_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\penguin"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\penguin\"
ObjectFile="vc_mswu\penguin\"
ProgramDataBaseFileName="vc_mswu\penguin.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\penguin.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\penguin.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\penguin_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\penguin"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\penguin\"
ObjectFile="vc_mswud\penguin\"
ProgramDataBaseFileName="vc_mswud\penguin.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_gl.lib opengl32.lib glu32.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_gl.lib opengl32.lib glu32.lib 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"
OutputFile="vc_mswud\penguin.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\penguin.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\penguin_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,21 +523,25 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\dxfrenderer.cpp"/>
+ RelativePath=".\dxfrenderer.cpp">
+ </File>
<File
- RelativePath=".\penguin.cpp"/>
+ RelativePath=".\penguin.cpp">
+ </File>
<File
- RelativePath=".\trackball.c"/>
+ RelativePath=".\trackball.c">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\penguin.rc"/>
+ RelativePath=".\penguin.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/opengl/penguin/penguin_vc8.vcproj b/samples/opengl/penguin/penguin_vc8.vcproj
index 79bfe346c6..a80cb63cae 100644
--- a/samples/opengl/penguin/penguin_vc8.vcproj
+++ b/samples/opengl/penguin/penguin_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\penguin\"
ObjectFile="vc_mswunivudll\penguin\"
ProgramDataBaseFileName="vc_mswunivudll\penguin.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\penguin.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\penguin.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\penguin\"
ObjectFile="vc_mswunivuddll\penguin\"
ProgramDataBaseFileName="vc_mswunivuddll\penguin.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_gl.lib opengl32.lib glu32.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_gl.lib opengl32.lib glu32.lib 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"
OutputFile="vc_mswunivuddll\penguin.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\penguin.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\penguin\"
ObjectFile="vc_mswudll\penguin\"
ProgramDataBaseFileName="vc_mswudll\penguin.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\penguin.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\penguin.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\penguin\"
ObjectFile="vc_mswuddll\penguin\"
ProgramDataBaseFileName="vc_mswuddll\penguin.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_gl.lib opengl32.lib glu32.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_gl.lib opengl32.lib glu32.lib 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"
OutputFile="vc_mswuddll\penguin.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\penguin.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\penguin\"
ObjectFile="vc_mswunivu\penguin\"
ProgramDataBaseFileName="vc_mswunivu\penguin.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\penguin.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\penguin.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\penguin\"
ObjectFile="vc_mswunivud\penguin\"
ProgramDataBaseFileName="vc_mswunivud\penguin.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_gl.lib opengl32.lib glu32.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_gl.lib opengl32.lib glu32.lib 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"
OutputFile="vc_mswunivud\penguin.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\penguin.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\penguin\"
ObjectFile="vc_mswu\penguin\"
ProgramDataBaseFileName="vc_mswu\penguin.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\penguin.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\penguin.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\penguin\"
ObjectFile="vc_mswud\penguin\"
ProgramDataBaseFileName="vc_mswud\penguin.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_gl.lib opengl32.lib glu32.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_gl.lib opengl32.lib glu32.lib 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"
OutputFile="vc_mswud\penguin.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\penguin.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,27 +784,31 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\dxfrenderer.cpp"
- />
+ >
+ </File>
<File
RelativePath=".\penguin.cpp"
- />
+ >
+ </File>
<File
RelativePath=".\trackball.c"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\penguin.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/ownerdrw/Makefile.in b/samples/ownerdrw/Makefile.in
index 026e492182..d8cd73e3ad 100644
--- a/samples/ownerdrw/Makefile.in
+++ b/samples/ownerdrw/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ OWNERDRW_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: ownerdrw$(EXEEXT) $(__ownerdrw_bundle___depname) data
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
ownerdrw$(EXEEXT): $(OWNERDRW_OBJECTS) $(__ownerdrw___win32rc)
- $(CXX) -o $@ $(OWNERDRW_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(OWNERDRW_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)
$(__ownerdrw___mac_setfilecmd)
$(__ownerdrw___os2_emxbindcmd)
@@ -204,6 +204,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean ownerdrw_bundle data
diff --git a/samples/ownerdrw/makefile.bcc b/samples/ownerdrw/makefile.bcc
index 64be277437..91827b843c 100644
--- a/samples/ownerdrw/makefile.bcc
+++ b/samples/ownerdrw/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\ownerdrw.ils del $(OBJS)\ownerdrw.ils
$(OBJS)\ownerdrw.exe: $(OWNERDRW_OBJECTS) $(OBJS)\ownerdrw_ownerdrw.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/ownerdrw/makefile.gcc b/samples/ownerdrw/makefile.gcc
index cce9387251..1662fa431c 100644
--- a/samples/ownerdrw/makefile.gcc
+++ b/samples/ownerdrw/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\ownerdrw.exe del $(OBJS)\ownerdrw.exe
$(OBJS)\ownerdrw.exe: $(OWNERDRW_OBJECTS) $(OBJS)\ownerdrw_ownerdrw_rc.o
- $(CXX) -o $@ $(OWNERDRW_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
data:
if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/ownerdrw/makefile.unx b/samples/ownerdrw/makefile.unx
index a364c80196..147b8dfa36 100644
--- a/samples/ownerdrw/makefile.unx
+++ b/samples/ownerdrw/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild ownerdrw
-install: all
+install:
uninstall:
diff --git a/samples/ownerdrw/makefile.vc b/samples/ownerdrw/makefile.vc
index 0def4ce990..f05795de94 100644
--- a/samples/ownerdrw/makefile.vc
+++ b/samples/ownerdrw/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\ownerdrw.pdb del $(OBJS)\ownerdrw.pdb
$(OBJS)\ownerdrw.exe: $(OWNERDRW_OBJECTS) $(OBJS)\ownerdrw_ownerdrw.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\ownerdrw.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\ownerdrw.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/ownerdrw/makefile.wat b/samples/ownerdrw/makefile.wat
index 9ba3999a67..4f0e2cbbad 100644
--- a/samples/ownerdrw/makefile.wat
+++ b/samples/ownerdrw/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\ownerdrw.exe : $(OWNERDRW_OBJECTS) $(OBJS)\ownerdrw_ownerdrw.res
@%append $(OBJS)\ownerdrw.lbc option quiet
@%append $(OBJS)\ownerdrw.lbc name $^@
@%append $(OBJS)\ownerdrw.lbc option caseexact
- @%append $(OBJS)\ownerdrw.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\ownerdrw.lbc library %i
@%append $(OBJS)\ownerdrw.lbc option resource=$(OBJS)\ownerdrw_ownerdrw.res
diff --git a/samples/ownerdrw/ownerdrw_vc7.vcproj b/samples/ownerdrw/ownerdrw_vc7.vcproj
index d460c6d63a..5809648c3c 100644
--- a/samples/ownerdrw/ownerdrw_vc7.vcproj
+++ b/samples/ownerdrw/ownerdrw_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\ownerdrw"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\ownerdrw\"
ObjectFile="vc_mswunivudll\ownerdrw\"
ProgramDataBaseFileName="vc_mswunivudll\ownerdrw.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\ownerdrw.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\ownerdrw.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\ownerdrw_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\ownerdrw"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\ownerdrw\"
ObjectFile="vc_mswunivuddll\ownerdrw\"
ProgramDataBaseFileName="vc_mswunivuddll\ownerdrw.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\ownerdrw.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\ownerdrw.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\ownerdrw_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\ownerdrw"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\ownerdrw\"
ObjectFile="vc_mswudll\ownerdrw\"
ProgramDataBaseFileName="vc_mswudll\ownerdrw.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\ownerdrw.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\ownerdrw.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\ownerdrw_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\ownerdrw"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\ownerdrw\"
ObjectFile="vc_mswuddll\ownerdrw\"
ProgramDataBaseFileName="vc_mswuddll\ownerdrw.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\ownerdrw.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\ownerdrw.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\ownerdrw_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\ownerdrw"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\ownerdrw\"
ObjectFile="vc_mswunivu\ownerdrw\"
ProgramDataBaseFileName="vc_mswunivu\ownerdrw.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\ownerdrw.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\ownerdrw.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\ownerdrw_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\ownerdrw"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\ownerdrw\"
ObjectFile="vc_mswunivud\ownerdrw\"
ProgramDataBaseFileName="vc_mswunivud\ownerdrw.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\ownerdrw.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\ownerdrw.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\ownerdrw_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\ownerdrw"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\ownerdrw\"
ObjectFile="vc_mswu\ownerdrw\"
ProgramDataBaseFileName="vc_mswu\ownerdrw.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\ownerdrw.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\ownerdrw.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\ownerdrw_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\ownerdrw"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\ownerdrw\"
ObjectFile="vc_mswud\ownerdrw\"
ProgramDataBaseFileName="vc_mswud\ownerdrw.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\ownerdrw.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\ownerdrw.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\ownerdrw_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\ownerdrw.cpp"/>
+ RelativePath=".\ownerdrw.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\ownerdrw.rc"/>
+ RelativePath=".\ownerdrw.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/ownerdrw/ownerdrw_vc8.vcproj b/samples/ownerdrw/ownerdrw_vc8.vcproj
index 7a3a9b203b..43972f9dfa 100644
--- a/samples/ownerdrw/ownerdrw_vc8.vcproj
+++ b/samples/ownerdrw/ownerdrw_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\ownerdrw\"
ObjectFile="vc_mswunivudll\ownerdrw\"
ProgramDataBaseFileName="vc_mswunivudll\ownerdrw.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\ownerdrw.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\ownerdrw.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\ownerdrw\"
ObjectFile="vc_mswunivuddll\ownerdrw\"
ProgramDataBaseFileName="vc_mswunivuddll\ownerdrw.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\ownerdrw.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\ownerdrw.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\ownerdrw\"
ObjectFile="vc_mswudll\ownerdrw\"
ProgramDataBaseFileName="vc_mswudll\ownerdrw.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\ownerdrw.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\ownerdrw.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\ownerdrw\"
ObjectFile="vc_mswuddll\ownerdrw\"
ProgramDataBaseFileName="vc_mswuddll\ownerdrw.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\ownerdrw.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\ownerdrw.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\ownerdrw\"
ObjectFile="vc_mswunivu\ownerdrw\"
ProgramDataBaseFileName="vc_mswunivu\ownerdrw.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\ownerdrw.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\ownerdrw.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\ownerdrw\"
ObjectFile="vc_mswunivud\ownerdrw\"
ProgramDataBaseFileName="vc_mswunivud\ownerdrw.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\ownerdrw.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\ownerdrw.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\ownerdrw\"
ObjectFile="vc_mswu\ownerdrw\"
ProgramDataBaseFileName="vc_mswu\ownerdrw.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\ownerdrw.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\ownerdrw.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\ownerdrw\"
ObjectFile="vc_mswud\ownerdrw\"
ProgramDataBaseFileName="vc_mswud\ownerdrw.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\ownerdrw.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\ownerdrw.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\ownerdrw.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\ownerdrw.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/popup/Makefile.in b/samples/popup/Makefile.in
index dab4b8c98d..f20c1128e5 100644
--- a/samples/popup/Makefile.in
+++ b/samples/popup/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ POPUP_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: popup$(EXEEXT) $(__popup_bundle___depname)
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
popup$(EXEEXT): $(POPUP_OBJECTS) $(__popup___win32rc)
- $(CXX) -o $@ $(POPUP_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(POPUP_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)
$(__popup___mac_setfilecmd)
$(__popup___os2_emxbindcmd)
@@ -192,6 +192,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean popup_bundle
diff --git a/samples/popup/makefile.bcc b/samples/popup/makefile.bcc
index 29882ca471..65662da69d 100644
--- a/samples/popup/makefile.bcc
+++ b/samples/popup/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\popup.ils del $(OBJS)\popup.ils
$(OBJS)\popup.exe: $(POPUP_OBJECTS) $(OBJS)\popup_sample.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/popup/makefile.gcc b/samples/popup/makefile.gcc
index affd196c3c..099791c09a 100644
--- a/samples/popup/makefile.gcc
+++ b/samples/popup/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\popup.exe del $(OBJS)\popup.exe
$(OBJS)\popup.exe: $(POPUP_OBJECTS) $(OBJS)\popup_sample_rc.o
- $(CXX) -o $@ $(POPUP_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(OBJS)\popup_popup.o: ./popup.cpp
$(CXX) -c -o $@ $(POPUP_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/popup/makefile.unx b/samples/popup/makefile.unx
index 08e8cfc6cb..0287a658e7 100644
--- a/samples/popup/makefile.unx
+++ b/samples/popup/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild popup
-install: all
+install:
uninstall:
diff --git a/samples/popup/makefile.vc b/samples/popup/makefile.vc
index 456d98d20e..fdf57690f3 100644
--- a/samples/popup/makefile.vc
+++ b/samples/popup/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\popup.pdb del $(OBJS)\popup.pdb
$(OBJS)\popup.exe: $(POPUP_OBJECTS) $(OBJS)\popup_sample.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\popup.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\popup.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/popup/makefile.wat b/samples/popup/makefile.wat
index 8b90ce505d..745d40d8be 100644
--- a/samples/popup/makefile.wat
+++ b/samples/popup/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\popup.exe : $(POPUP_OBJECTS) $(OBJS)\popup_sample.res
@%append $(OBJS)\popup.lbc option quiet
@%append $(OBJS)\popup.lbc name $^@
@%append $(OBJS)\popup.lbc option caseexact
- @%append $(OBJS)\popup.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\popup.lbc library %i
@%append $(OBJS)\popup.lbc option resource=$(OBJS)\popup_sample.res
diff --git a/samples/popup/popup_vc7.vcproj b/samples/popup/popup_vc7.vcproj
index fb698f37f6..79880681c0 100644
--- a/samples/popup/popup_vc7.vcproj
+++ b/samples/popup/popup_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\popup"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\popup\"
ObjectFile="vc_mswunivudll\popup\"
ProgramDataBaseFileName="vc_mswunivudll\popup.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\popup.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\popup.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\popup_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\popup"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\popup\"
ObjectFile="vc_mswunivuddll\popup\"
ProgramDataBaseFileName="vc_mswunivuddll\popup.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\popup.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\popup.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\popup_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\popup"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\popup\"
ObjectFile="vc_mswudll\popup\"
ProgramDataBaseFileName="vc_mswudll\popup.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\popup.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\popup.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\popup_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\popup"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\popup\"
ObjectFile="vc_mswuddll\popup\"
ProgramDataBaseFileName="vc_mswuddll\popup.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\popup.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\popup.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\popup_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\popup"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\popup\"
ObjectFile="vc_mswunivu\popup\"
ProgramDataBaseFileName="vc_mswunivu\popup.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\popup.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\popup.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\popup_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\popup"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\popup\"
ObjectFile="vc_mswunivud\popup\"
ProgramDataBaseFileName="vc_mswunivud\popup.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\popup.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\popup.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\popup_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\popup"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\popup\"
ObjectFile="vc_mswu\popup\"
ProgramDataBaseFileName="vc_mswu\popup.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\popup.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\popup.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\popup_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\popup"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\popup\"
ObjectFile="vc_mswud\popup\"
ProgramDataBaseFileName="vc_mswud\popup.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\popup.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\popup.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\popup_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\popup.cpp"/>
+ RelativePath=".\popup.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\..\sample.rc"/>
+ RelativePath=".\..\sample.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/popup/popup_vc8.vcproj b/samples/popup/popup_vc8.vcproj
index 8c4923daaa..49eef88b94 100644
--- a/samples/popup/popup_vc8.vcproj
+++ b/samples/popup/popup_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\popup\"
ObjectFile="vc_mswunivudll\popup\"
ProgramDataBaseFileName="vc_mswunivudll\popup.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\popup.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\popup.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\popup\"
ObjectFile="vc_mswunivuddll\popup\"
ProgramDataBaseFileName="vc_mswunivuddll\popup.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\popup.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\popup.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\popup\"
ObjectFile="vc_mswudll\popup\"
ProgramDataBaseFileName="vc_mswudll\popup.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\popup.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\popup.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\popup\"
ObjectFile="vc_mswuddll\popup\"
ProgramDataBaseFileName="vc_mswuddll\popup.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\popup.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\popup.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\popup\"
ObjectFile="vc_mswunivu\popup\"
ProgramDataBaseFileName="vc_mswunivu\popup.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\popup.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\popup.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\popup\"
ObjectFile="vc_mswunivud\popup\"
ProgramDataBaseFileName="vc_mswunivud\popup.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\popup.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\popup.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\popup\"
ObjectFile="vc_mswu\popup\"
ProgramDataBaseFileName="vc_mswu\popup.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\popup.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\popup.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\popup\"
ObjectFile="vc_mswud\popup\"
ProgramDataBaseFileName="vc_mswud\popup.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\popup.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\popup.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\popup.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\..\sample.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/power/Makefile.in b/samples/power/Makefile.in
index c1ebc8f833..bdc6740065 100644
--- a/samples/power/Makefile.in
+++ b/samples/power/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ POWER_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: power$(EXEEXT) $(__power_bundle___depname)
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
power$(EXEEXT): $(POWER_OBJECTS) $(__power___win32rc)
- $(CXX) -o $@ $(POWER_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(POWER_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)
$(__power___mac_setfilecmd)
$(__power___os2_emxbindcmd)
@@ -192,6 +192,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean power_bundle
diff --git a/samples/power/makefile.bcc b/samples/power/makefile.bcc
index adb8235b4f..f825eb9c00 100644
--- a/samples/power/makefile.bcc
+++ b/samples/power/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\power.ils del $(OBJS)\power.ils
$(OBJS)\power.exe: $(POWER_OBJECTS) $(OBJS)\power_sample.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/power/makefile.gcc b/samples/power/makefile.gcc
index 28ddff852d..71879d0949 100644
--- a/samples/power/makefile.gcc
+++ b/samples/power/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\power.exe del $(OBJS)\power.exe
$(OBJS)\power.exe: $(POWER_OBJECTS) $(OBJS)\power_sample_rc.o
- $(CXX) -o $@ $(POWER_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(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
diff --git a/samples/power/makefile.unx b/samples/power/makefile.unx
index 80c202448a..cd52cc408a 100644
--- a/samples/power/makefile.unx
+++ b/samples/power/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild power
-install: all
+install:
uninstall:
diff --git a/samples/power/makefile.vc b/samples/power/makefile.vc
index 2823beda47..11b87d274d 100644
--- a/samples/power/makefile.vc
+++ b/samples/power/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\power.pdb del $(OBJS)\power.pdb
$(OBJS)\power.exe: $(POWER_OBJECTS) $(OBJS)\power_sample.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\power.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\power.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/power/makefile.wat b/samples/power/makefile.wat
index 7676483c8e..3719e6e797 100644
--- a/samples/power/makefile.wat
+++ b/samples/power/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\power.exe : $(POWER_OBJECTS) $(OBJS)\power_sample.res
@%append $(OBJS)\power.lbc option quiet
@%append $(OBJS)\power.lbc name $^@
@%append $(OBJS)\power.lbc option caseexact
- @%append $(OBJS)\power.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\power.lbc library %i
@%append $(OBJS)\power.lbc option resource=$(OBJS)\power_sample.res
diff --git a/samples/power/power_vc7.vcproj b/samples/power/power_vc7.vcproj
index f7cf3c4266..78dcf93680 100644
--- a/samples/power/power_vc7.vcproj
+++ b/samples/power/power_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\power"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\power\"
ObjectFile="vc_mswunivudll\power\"
ProgramDataBaseFileName="vc_mswunivudll\power.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\power.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\power.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\power_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\power"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\power\"
ObjectFile="vc_mswunivuddll\power\"
ProgramDataBaseFileName="vc_mswunivuddll\power.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\power.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\power.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\power_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\power"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\power\"
ObjectFile="vc_mswudll\power\"
ProgramDataBaseFileName="vc_mswudll\power.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\power.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\power.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\power_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\power"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\power\"
ObjectFile="vc_mswuddll\power\"
ProgramDataBaseFileName="vc_mswuddll\power.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\power.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\power.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\power_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\power"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\power\"
ObjectFile="vc_mswunivu\power\"
ProgramDataBaseFileName="vc_mswunivu\power.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\power.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\power.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\power_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\power"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\power\"
ObjectFile="vc_mswunivud\power\"
ProgramDataBaseFileName="vc_mswunivud\power.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\power.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\power.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\power_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\power"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\power\"
ObjectFile="vc_mswu\power\"
ProgramDataBaseFileName="vc_mswu\power.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\power.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\power.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\power_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\power"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\power\"
ObjectFile="vc_mswud\power\"
ProgramDataBaseFileName="vc_mswud\power.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\power.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\power.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\power_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\power.cpp"/>
+ RelativePath=".\power.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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"/>
+ RelativePath=".\..\..\samples\sample.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/power/power_vc8.vcproj b/samples/power/power_vc8.vcproj
index 6f38ff0bd6..efbd33e54a 100644
--- a/samples/power/power_vc8.vcproj
+++ b/samples/power/power_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\power\"
ObjectFile="vc_mswunivudll\power\"
ProgramDataBaseFileName="vc_mswunivudll\power.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\power.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\power.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\power\"
ObjectFile="vc_mswunivuddll\power\"
ProgramDataBaseFileName="vc_mswunivuddll\power.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\power.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\power.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\power\"
ObjectFile="vc_mswudll\power\"
ProgramDataBaseFileName="vc_mswudll\power.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\power.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\power.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\power\"
ObjectFile="vc_mswuddll\power\"
ProgramDataBaseFileName="vc_mswuddll\power.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\power.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\power.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\power\"
ObjectFile="vc_mswunivu\power\"
ProgramDataBaseFileName="vc_mswunivu\power.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\power.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\power.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\power\"
ObjectFile="vc_mswunivud\power\"
ProgramDataBaseFileName="vc_mswunivud\power.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\power.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\power.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\power\"
ObjectFile="vc_mswu\power\"
ProgramDataBaseFileName="vc_mswu\power.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\power.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\power.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\power\"
ObjectFile="vc_mswud\power\"
ProgramDataBaseFileName="vc_mswud\power.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\power.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\power.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\power.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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>
diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in
index 6f4b87e862..0c7065e1e2 100644
--- a/samples/printing/Makefile.in
+++ b/samples/printing/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ PRINTING_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: printing$(EXEEXT) $(__printing_bundle___depname)
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
printing$(EXEEXT): $(PRINTING_OBJECTS) $(__printing___win32rc)
- $(CXX) -o $@ $(PRINTING_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(PRINTING_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)
$(__printing___mac_setfilecmd)
$(__printing___os2_emxbindcmd)
@@ -192,6 +192,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean printing_bundle
diff --git a/samples/printing/makefile.bcc b/samples/printing/makefile.bcc
index eba9836115..b97c289ffb 100644
--- a/samples/printing/makefile.bcc
+++ b/samples/printing/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\printing.ils del $(OBJS)\printing.ils
$(OBJS)\printing.exe: $(PRINTING_OBJECTS) $(OBJS)\printing_printing.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/printing/makefile.gcc b/samples/printing/makefile.gcc
index 61e2423113..b7c83d3e68 100644
--- a/samples/printing/makefile.gcc
+++ b/samples/printing/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\printing.exe del $(OBJS)\printing.exe
$(OBJS)\printing.exe: $(PRINTING_OBJECTS) $(OBJS)\printing_printing_rc.o
- $(CXX) -o $@ $(PRINTING_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(OBJS)\printing_printing.o: ./printing.cpp
$(CXX) -c -o $@ $(PRINTING_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/printing/makefile.unx b/samples/printing/makefile.unx
index 9efeed76cd..4d67aadc16 100644
--- a/samples/printing/makefile.unx
+++ b/samples/printing/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild printing
-install: all
+install:
uninstall:
diff --git a/samples/printing/makefile.vc b/samples/printing/makefile.vc
index b71d4bb20f..e2a5e5c310 100644
--- a/samples/printing/makefile.vc
+++ b/samples/printing/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\printing.pdb del $(OBJS)\printing.pdb
$(OBJS)\printing.exe: $(PRINTING_OBJECTS) $(OBJS)\printing_printing.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\printing.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\printing.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/printing/makefile.wat b/samples/printing/makefile.wat
index 2ae69860d0..a85d099d71 100644
--- a/samples/printing/makefile.wat
+++ b/samples/printing/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\printing.exe : $(PRINTING_OBJECTS) $(OBJS)\printing_printing.res
@%append $(OBJS)\printing.lbc option quiet
@%append $(OBJS)\printing.lbc name $^@
@%append $(OBJS)\printing.lbc option caseexact
- @%append $(OBJS)\printing.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\printing.lbc library %i
@%append $(OBJS)\printing.lbc option resource=$(OBJS)\printing_printing.res
diff --git a/samples/printing/printing_vc7.vcproj b/samples/printing/printing_vc7.vcproj
index 2add4b37e6..f4311246fc 100644
--- a/samples/printing/printing_vc7.vcproj
+++ b/samples/printing/printing_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\printing"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\printing\"
ObjectFile="vc_mswunivudll\printing\"
ProgramDataBaseFileName="vc_mswunivudll\printing.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\printing.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\printing.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\printing_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\printing"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\printing\"
ObjectFile="vc_mswunivuddll\printing\"
ProgramDataBaseFileName="vc_mswunivuddll\printing.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\printing.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\printing.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\printing_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\printing"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\printing\"
ObjectFile="vc_mswudll\printing\"
ProgramDataBaseFileName="vc_mswudll\printing.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\printing.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\printing.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\printing_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\printing"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\printing\"
ObjectFile="vc_mswuddll\printing\"
ProgramDataBaseFileName="vc_mswuddll\printing.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\printing.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\printing.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\printing_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\printing"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\printing\"
ObjectFile="vc_mswunivu\printing\"
ProgramDataBaseFileName="vc_mswunivu\printing.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\printing.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\printing.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\printing_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\printing"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\printing\"
ObjectFile="vc_mswunivud\printing\"
ProgramDataBaseFileName="vc_mswunivud\printing.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\printing.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\printing.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\printing_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\printing"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\printing\"
ObjectFile="vc_mswu\printing\"
ProgramDataBaseFileName="vc_mswu\printing.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\printing.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\printing.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\printing_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\printing"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\printing\"
ObjectFile="vc_mswud\printing\"
ProgramDataBaseFileName="vc_mswud\printing.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\printing.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\printing.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\printing_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\printing.cpp"/>
+ RelativePath=".\printing.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\printing.rc"/>
+ RelativePath=".\printing.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/printing/printing_vc8.vcproj b/samples/printing/printing_vc8.vcproj
index bb3bb4b862..e9671d4663 100644
--- a/samples/printing/printing_vc8.vcproj
+++ b/samples/printing/printing_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\printing\"
ObjectFile="vc_mswunivudll\printing\"
ProgramDataBaseFileName="vc_mswunivudll\printing.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\printing.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\printing.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\printing\"
ObjectFile="vc_mswunivuddll\printing\"
ProgramDataBaseFileName="vc_mswunivuddll\printing.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\printing.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\printing.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\printing\"
ObjectFile="vc_mswudll\printing\"
ProgramDataBaseFileName="vc_mswudll\printing.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\printing.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\printing.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\printing\"
ObjectFile="vc_mswuddll\printing\"
ProgramDataBaseFileName="vc_mswuddll\printing.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\printing.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\printing.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\printing\"
ObjectFile="vc_mswunivu\printing\"
ProgramDataBaseFileName="vc_mswunivu\printing.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\printing.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\printing.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\printing\"
ObjectFile="vc_mswunivud\printing\"
ProgramDataBaseFileName="vc_mswunivud\printing.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\printing.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\printing.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\printing\"
ObjectFile="vc_mswu\printing\"
ProgramDataBaseFileName="vc_mswu\printing.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\printing.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\printing.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\printing\"
ObjectFile="vc_mswud\printing\"
ProgramDataBaseFileName="vc_mswud\printing.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\printing.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\printing.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\printing.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\printing.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/propgrid/Makefile.in b/samples/propgrid/Makefile.in
index dfa5fbc59e..634e288c5e 100644
--- a/samples/propgrid/Makefile.in
+++ b/samples/propgrid/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -64,7 +64,7 @@ PROPGRID_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -121,28 +121,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: propgrid$(EXEEXT) $(__propgrid_bundle___depname)
-install: all
+install:
uninstall:
@@ -158,7 +158,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
propgrid$(EXEEXT): $(PROPGRID_OBJECTS) $(__propgrid___win32rc)
- $(CXX) -o $@ $(PROPGRID_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_PROPGRID_p) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
+ $(CXX) -o $@ $(PROPGRID_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_PROPGRID_p) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
$(__propgrid___mac_setfilecmd)
$(__propgrid___os2_emxbindcmd)
@@ -212,6 +212,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean propgrid_bundle
diff --git a/samples/propgrid/makefile.bcc b/samples/propgrid/makefile.bcc
index b7a928dec9..0fc67eecf3 100644
--- a/samples/propgrid/makefile.bcc
+++ b/samples/propgrid/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -240,7 +240,7 @@ clean:
-if exist $(OBJS)\propgrid.ils del $(OBJS)\propgrid.ils
$(OBJS)\propgrid.exe: $(PROPGRID_OBJECTS) $(OBJS)\propgrid_sample.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/propgrid/makefile.gcc b/samples/propgrid/makefile.gcc
index 55c92a1a5c..0a818553e0 100644
--- a/samples/propgrid/makefile.gcc
+++ b/samples/propgrid/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -235,7 +235,7 @@ clean:
-if exist $(OBJS)\propgrid.exe del $(OBJS)\propgrid.exe
$(OBJS)\propgrid.exe: $(PROPGRID_OBJECTS) $(OBJS)\propgrid_sample_rc.o
- $(CXX) -o $@ $(PROPGRID_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(OBJS)\propgrid_propgrid.o: ./propgrid.cpp
$(CXX) -c -o $@ $(PROPGRID_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/propgrid/makefile.unx b/samples/propgrid/makefile.unx
index c3be594a55..f10a60d155 100644
--- a/samples/propgrid/makefile.unx
+++ b/samples/propgrid/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.
### Variables: ###
-CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD
+CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP
WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1)
WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2)
WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \
@@ -88,7 +88,7 @@ endif
all: test_for_selected_wxbuild propgrid
-install: all
+install:
uninstall:
@@ -101,7 +101,7 @@ test_for_selected_wxbuild:
@$(WX_CONFIG) $(WX_CONFIG_FLAGS)
propgrid: $(PROPGRID_OBJECTS)
- $(CXX) -o $@ $(PROPGRID_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs propgrid,adv,core,base`
+ $(CXX) -o $@ $(PROPGRID_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs propgrid,adv,core,base` $(LDFLAGS)
propgrid_propgrid.o: ./propgrid.cpp
$(CXX) -c -o $@ $(PROPGRID_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/propgrid/makefile.vc b/samples/propgrid/makefile.vc
index eeddc4658a..6942f120b4 100644
--- a/samples/propgrid/makefile.vc
+++ b/samples/propgrid/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -55,18 +55,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -76,18 +76,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -316,7 +316,7 @@ clean:
-if exist $(OBJS)\propgrid.pdb del $(OBJS)\propgrid.pdb
$(OBJS)\propgrid.exe: $(PROPGRID_OBJECTS) $(OBJS)\propgrid_sample.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\propgrid.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\propgrid.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/propgrid/makefile.wat b/samples/propgrid/makefile.wat
index 424d4678a8..302e86b461 100644
--- a/samples/propgrid/makefile.wat
+++ b/samples/propgrid/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -264,7 +264,7 @@ $(OBJS)\propgrid.exe : $(PROPGRID_OBJECTS) $(OBJS)\propgrid_sample.res
@%append $(OBJS)\propgrid.lbc option quiet
@%append $(OBJS)\propgrid.lbc name $^@
@%append $(OBJS)\propgrid.lbc option caseexact
- @%append $(OBJS)\propgrid.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\propgrid.lbc library %i
@%append $(OBJS)\propgrid.lbc option resource=$(OBJS)\propgrid_sample.res
diff --git a/samples/propgrid/propgrid_vc7.vcproj b/samples/propgrid/propgrid_vc7.vcproj
index d3d81f5834..925a28541f 100644
--- a/samples/propgrid/propgrid_vc7.vcproj
+++ b/samples/propgrid/propgrid_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\propgrid"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\propgrid\"
ObjectFile="vc_mswunivudll\propgrid\"
ProgramDataBaseFileName="vc_mswunivudll\propgrid.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\propgrid.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\propgrid.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\propgrid_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\propgrid"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\propgrid\"
ObjectFile="vc_mswunivuddll\propgrid\"
ProgramDataBaseFileName="vc_mswunivuddll\propgrid.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_propgrid.lib wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_propgrid.lib wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivuddll\propgrid.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\propgrid.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\propgrid_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\propgrid"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\propgrid\"
ObjectFile="vc_mswudll\propgrid\"
ProgramDataBaseFileName="vc_mswudll\propgrid.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\propgrid.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\propgrid.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\propgrid_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\propgrid"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\propgrid\"
ObjectFile="vc_mswuddll\propgrid\"
ProgramDataBaseFileName="vc_mswuddll\propgrid.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_propgrid.lib wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_propgrid.lib wxmsw29ud_adv.lib 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"
OutputFile="vc_mswuddll\propgrid.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\propgrid.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\propgrid_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\propgrid"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\propgrid\"
ObjectFile="vc_mswunivu\propgrid\"
ProgramDataBaseFileName="vc_mswunivu\propgrid.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\propgrid.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\propgrid.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\propgrid_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\propgrid"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\propgrid\"
ObjectFile="vc_mswunivud\propgrid\"
ProgramDataBaseFileName="vc_mswunivud\propgrid.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_propgrid.lib wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_propgrid.lib wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivud\propgrid.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\propgrid.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\propgrid_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\propgrid"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\propgrid\"
ObjectFile="vc_mswu\propgrid\"
ProgramDataBaseFileName="vc_mswu\propgrid.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\propgrid.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\propgrid.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\propgrid_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\propgrid"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\propgrid\"
ObjectFile="vc_mswud\propgrid\"
ProgramDataBaseFileName="vc_mswud\propgrid.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_propgrid.lib wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_propgrid.lib wxmsw29ud_adv.lib 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"
OutputFile="vc_mswud\propgrid.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\propgrid.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\propgrid_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,23 +523,28 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\propgrid.cpp"/>
+ RelativePath=".\propgrid.cpp">
+ </File>
<File
- RelativePath=".\propgrid_minimal.cpp"/>
+ RelativePath=".\propgrid_minimal.cpp">
+ </File>
<File
- RelativePath=".\sampleprops.cpp"/>
+ RelativePath=".\sampleprops.cpp">
+ </File>
<File
- RelativePath=".\tests.cpp"/>
+ RelativePath=".\tests.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\..\sample.rc"/>
+ RelativePath=".\..\sample.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/propgrid/propgrid_vc8.vcproj b/samples/propgrid/propgrid_vc8.vcproj
index 6d3f241683..bb5f546727 100644
--- a/samples/propgrid/propgrid_vc8.vcproj
+++ b/samples/propgrid/propgrid_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\propgrid\"
ObjectFile="vc_mswunivudll\propgrid\"
ProgramDataBaseFileName="vc_mswunivudll\propgrid.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\propgrid.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\propgrid.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\propgrid\"
ObjectFile="vc_mswunivuddll\propgrid\"
ProgramDataBaseFileName="vc_mswunivuddll\propgrid.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_propgrid.lib wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_propgrid.lib wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivuddll\propgrid.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\propgrid.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\propgrid\"
ObjectFile="vc_mswudll\propgrid\"
ProgramDataBaseFileName="vc_mswudll\propgrid.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\propgrid.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\propgrid.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\propgrid\"
ObjectFile="vc_mswuddll\propgrid\"
ProgramDataBaseFileName="vc_mswuddll\propgrid.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_propgrid.lib wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_propgrid.lib wxmsw29ud_adv.lib 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"
OutputFile="vc_mswuddll\propgrid.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\propgrid.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\propgrid\"
ObjectFile="vc_mswunivu\propgrid\"
ProgramDataBaseFileName="vc_mswunivu\propgrid.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\propgrid.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\propgrid.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\propgrid\"
ObjectFile="vc_mswunivud\propgrid\"
ProgramDataBaseFileName="vc_mswunivud\propgrid.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_propgrid.lib wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_propgrid.lib wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivud\propgrid.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\propgrid.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\propgrid\"
ObjectFile="vc_mswu\propgrid\"
ProgramDataBaseFileName="vc_mswu\propgrid.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\propgrid.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\propgrid.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\propgrid\"
ObjectFile="vc_mswud\propgrid\"
ProgramDataBaseFileName="vc_mswud\propgrid.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_propgrid.lib wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_propgrid.lib wxmsw29ud_adv.lib 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"
OutputFile="vc_mswud\propgrid.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\propgrid.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,30 +784,35 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\propgrid.cpp"
- />
+ >
+ </File>
<File
RelativePath=".\propgrid_minimal.cpp"
- />
+ >
+ </File>
<File
RelativePath=".\sampleprops.cpp"
- />
+ >
+ </File>
<File
RelativePath=".\tests.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\..\sample.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/regtest/Makefile.in b/samples/regtest/Makefile.in
index 6abdc29fb2..d9bfd1c8b1 100644
--- a/samples/regtest/Makefile.in
+++ b/samples/regtest/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ REGTEST_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: regtest$(EXEEXT) $(__regtest_bundle___depname)
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
regtest$(EXEEXT): $(REGTEST_OBJECTS) $(__regtest___win32rc)
- $(CXX) -o $@ $(REGTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(REGTEST_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)
$(__regtest___mac_setfilecmd)
$(__regtest___os2_emxbindcmd)
@@ -192,6 +192,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean regtest_bundle
diff --git a/samples/regtest/makefile.bcc b/samples/regtest/makefile.bcc
index 328cfcacae..e765d51aaf 100644
--- a/samples/regtest/makefile.bcc
+++ b/samples/regtest/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\regtest.ils del $(OBJS)\regtest.ils
$(OBJS)\regtest.exe: $(REGTEST_OBJECTS) $(OBJS)\regtest_regtest.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/regtest/makefile.gcc b/samples/regtest/makefile.gcc
index 861ba9f9d8..48503b00de 100644
--- a/samples/regtest/makefile.gcc
+++ b/samples/regtest/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\regtest.exe del $(OBJS)\regtest.exe
$(OBJS)\regtest.exe: $(REGTEST_OBJECTS) $(OBJS)\regtest_regtest_rc.o
- $(CXX) -o $@ $(REGTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(OBJS)\regtest_regtest.o: ./regtest.cpp
$(CXX) -c -o $@ $(REGTEST_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/regtest/makefile.unx b/samples/regtest/makefile.unx
index 95f6a16892..c18d72c29f 100644
--- a/samples/regtest/makefile.unx
+++ b/samples/regtest/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild regtest
-install: all
+install:
uninstall:
diff --git a/samples/regtest/makefile.vc b/samples/regtest/makefile.vc
index 2c5c8fb8a6..902dd12334 100644
--- a/samples/regtest/makefile.vc
+++ b/samples/regtest/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\regtest.pdb del $(OBJS)\regtest.pdb
$(OBJS)\regtest.exe: $(REGTEST_OBJECTS) $(OBJS)\regtest_regtest.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\regtest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\regtest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/regtest/makefile.wat b/samples/regtest/makefile.wat
index 62bd27dc8b..273050ddfd 100644
--- a/samples/regtest/makefile.wat
+++ b/samples/regtest/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\regtest.exe : $(REGTEST_OBJECTS) $(OBJS)\regtest_regtest.res
@%append $(OBJS)\regtest.lbc option quiet
@%append $(OBJS)\regtest.lbc name $^@
@%append $(OBJS)\regtest.lbc option caseexact
- @%append $(OBJS)\regtest.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\regtest.lbc library %i
@%append $(OBJS)\regtest.lbc option resource=$(OBJS)\regtest_regtest.res
diff --git a/samples/regtest/regtest_vc7.vcproj b/samples/regtest/regtest_vc7.vcproj
index 045444eed8..1e7d2a1362 100644
--- a/samples/regtest/regtest_vc7.vcproj
+++ b/samples/regtest/regtest_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\regtest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\regtest\"
ObjectFile="vc_mswunivudll\regtest\"
ProgramDataBaseFileName="vc_mswunivudll\regtest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\regtest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\regtest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\regtest_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\regtest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\regtest\"
ObjectFile="vc_mswunivuddll\regtest\"
ProgramDataBaseFileName="vc_mswunivuddll\regtest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\regtest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\regtest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\regtest_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\regtest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\regtest\"
ObjectFile="vc_mswudll\regtest\"
ProgramDataBaseFileName="vc_mswudll\regtest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\regtest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\regtest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\regtest_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\regtest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\regtest\"
ObjectFile="vc_mswuddll\regtest\"
ProgramDataBaseFileName="vc_mswuddll\regtest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\regtest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\regtest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\regtest_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\regtest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\regtest\"
ObjectFile="vc_mswunivu\regtest\"
ProgramDataBaseFileName="vc_mswunivu\regtest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\regtest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\regtest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\regtest_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\regtest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\regtest\"
ObjectFile="vc_mswunivud\regtest\"
ProgramDataBaseFileName="vc_mswunivud\regtest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\regtest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\regtest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\regtest_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\regtest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\regtest\"
ObjectFile="vc_mswu\regtest\"
ProgramDataBaseFileName="vc_mswu\regtest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\regtest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\regtest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\regtest_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\regtest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\regtest\"
ObjectFile="vc_mswud\regtest\"
ProgramDataBaseFileName="vc_mswud\regtest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\regtest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\regtest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\regtest_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\regtest.cpp"/>
+ RelativePath=".\regtest.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\regtest.rc"/>
+ RelativePath=".\regtest.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/regtest/regtest_vc8.vcproj b/samples/regtest/regtest_vc8.vcproj
index 1b3186ab18..28547073de 100644
--- a/samples/regtest/regtest_vc8.vcproj
+++ b/samples/regtest/regtest_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\regtest\"
ObjectFile="vc_mswunivudll\regtest\"
ProgramDataBaseFileName="vc_mswunivudll\regtest.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\regtest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\regtest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\regtest\"
ObjectFile="vc_mswunivuddll\regtest\"
ProgramDataBaseFileName="vc_mswunivuddll\regtest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\regtest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\regtest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\regtest\"
ObjectFile="vc_mswudll\regtest\"
ProgramDataBaseFileName="vc_mswudll\regtest.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\regtest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\regtest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\regtest\"
ObjectFile="vc_mswuddll\regtest\"
ProgramDataBaseFileName="vc_mswuddll\regtest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\regtest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\regtest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\regtest\"
ObjectFile="vc_mswunivu\regtest\"
ProgramDataBaseFileName="vc_mswunivu\regtest.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\regtest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\regtest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\regtest\"
ObjectFile="vc_mswunivud\regtest\"
ProgramDataBaseFileName="vc_mswunivud\regtest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\regtest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\regtest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\regtest\"
ObjectFile="vc_mswu\regtest\"
ProgramDataBaseFileName="vc_mswu\regtest.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\regtest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\regtest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\regtest\"
ObjectFile="vc_mswud\regtest\"
ProgramDataBaseFileName="vc_mswud\regtest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\regtest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\regtest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\regtest.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\regtest.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/render/Makefile.in b/samples/render/Makefile.in
index 301c067018..36a37f61f5 100644
--- a/samples/render/Makefile.in
+++ b/samples/render/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -76,7 +76,7 @@ RENDDLL_OBJECTS = \
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -88,10 +88,10 @@ RENDDLL_OBJECTS = \
@COND_PLATFORM_UNIX_1@PLUGIN_VERSION0 = $(WX_VERSION)
@COND_PLATFORM_UNIX_0@PLUGVERDELIM =
@COND_PLATFORM_UNIX_1@PLUGVERDELIM = -
-@COND_BUILD_RELEASE_UNICODE_0@PLUGINSUFFIX =
-@COND_BUILD_DEBUG_UNICODE_0@PLUGINSUFFIX = d
-@COND_BUILD_RELEASE_UNICODE_1@PLUGINSUFFIX = u
-@COND_BUILD_DEBUG_UNICODE_1@PLUGINSUFFIX = ud
+@COND_BUILD_release_UNICODE_0@PLUGINSUFFIX =
+@COND_BUILD_debug_UNICODE_0@PLUGINSUFFIX = d
+@COND_BUILD_release_UNICODE_1@PLUGINSUFFIX = u
+@COND_BUILD_debug_UNICODE_1@PLUGINSUFFIX = ud
@COND_PLATFORM_MAC_0@__render___mac_setfilecmd = @true
@COND_PLATFORM_MAC_1@__render___mac_setfilecmd = \
@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL render$(EXEEXT)
@@ -140,28 +140,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: render$(EXEEXT) $(__render_bundle___depname) $(__renddll___depname)
-install: all $(__install_renddll___depname)
+install: $(__install_renddll___depname)
uninstall: $(__uninstall_renddll___depname)
@@ -179,7 +179,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
render$(EXEEXT): $(RENDER_OBJECTS) $(__render___win32rc)
- $(CXX) -o $@ $(RENDER_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(RENDER_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)
$(__render___mac_setfilecmd)
$(__render___os2_emxbindcmd)
@@ -208,9 +208,9 @@ render$(EXEEXT): $(RENDER_OBJECTS) $(__render___win32rc)
@COND_PLATFORM_MACOSX_1@render_bundle: $(____render_BUNDLE_TGT_REF_DEP)
@COND_SHARED_1@$(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE): $(RENDDLL_OBJECTS)
-@COND_SHARED_1@ $(SHARED_LD_MODULE_CXX) $@ $(RENDDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LIBS) $(__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)
+@COND_SHARED_1@ $(SHARED_LD_MODULE_CXX) $@ $(RENDDLL_OBJECTS) -L$(LIBDIRNAME) $(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)
-@COND_SHARED_1@install_renddll:
+@COND_SHARED_1@install_renddll: $(__renddll___depname)
@COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(PLUGINS_INST_DIR)
@COND_SHARED_1@ $(INSTALL_PROGRAM) $(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE) $(DESTDIR)$(PLUGINS_INST_DIR)
@@ -237,6 +237,7 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
-.PHONY: all install uninstall clean distclean render_bundle install_renddll uninstall_renddll
+.PHONY: all install uninstall clean distclean render_bundle install_renddll \
+ uninstall_renddll
diff --git a/samples/render/makefile.bcc b/samples/render/makefile.bcc
index 53d3f09ec1..1c29f4901a 100644
--- a/samples/render/makefile.bcc
+++ b/samples/render/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -260,13 +260,13 @@ clean:
-if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(WX_VERSION_NODOT)_bcc.ils del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(WX_VERSION_NODOT)_bcc.ils
$(OBJS)\render.exe: $(RENDER_OBJECTS) $(OBJS)\render_sample.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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)$(PLUGINSUFFIX)$(WX_VERSION_NODOT)_bcc.dll: $(RENDDLL_OBJECTS)
- ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
+ 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
diff --git a/samples/render/makefile.gcc b/samples/render/makefile.gcc
index b678b8d40a..8e7c68e4ad 100644
--- a/samples/render/makefile.gcc
+++ b/samples/render/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
COMPILER_PREFIX = gcc
@@ -259,11 +259,11 @@ clean:
-if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(WX_VERSION_NODOT)_gcc.dll del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(WX_VERSION_NODOT)_gcc.dll
$(OBJS)\render.exe: $(RENDER_OBJECTS) $(OBJS)\render_sample_rc.o
- $(CXX) -o $@ $(RENDER_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
ifeq ($(SHARED),1)
$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(WX_VERSION_NODOT)_gcc.dll: $(RENDDLL_OBJECTS)
- $(CXX) $(LINK_MODULE_FLAGS) -fPIC -o $@ $(RENDDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(__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
+ $(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
endif
$(OBJS)\render_sample_rc.o: ./../../samples/sample.rc
diff --git a/samples/render/makefile.unx b/samples/render/makefile.unx
index af1ae4cde8..aae311cab3 100644
--- a/samples/render/makefile.unx
+++ b/samples/render/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,40 +11,40 @@
# -------------------------------------------------------------------------
# Compiler flags to link loadable module
-LINK_MODULE_FLAGS := -shared
+LINK_MODULE_FLAGS ?= -shared
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
# Build shared lib plugin
-SHARED := 0
+SHARED ?= 0
@@ -98,7 +98,7 @@ endif
all: test_for_selected_wxbuild render $(__renddll___depname)
-install: all
+install:
uninstall:
diff --git a/samples/render/makefile.vc b/samples/render/makefile.vc
index fc823e1aa3..35875dbeb9 100644
--- a/samples/render/makefile.vc
+++ b/samples/render/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -63,18 +63,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -84,18 +84,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -341,13 +341,13 @@ clean:
-if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(WX_VERSION_NODOT)_vc.pdb del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(WX_VERSION_NODOT)_vc.pdb
$(OBJS)\render.exe: $(RENDER_OBJECTS) $(OBJS)\render_sample.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\render.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\render.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
!if "$(SHARED)" == "1"
$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(WX_VERSION_NODOT)_vc.dll: $(RENDDLL_OBJECTS)
- link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(WX_VERSION_NODOT)_vc.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+ link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(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
<<
!endif
diff --git a/samples/render/makefile.wat b/samples/render/makefile.wat
index 659ffed26c..97201e8205 100644
--- a/samples/render/makefile.wat
+++ b/samples/render/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -287,7 +287,7 @@ $(OBJS)\render.exe : $(RENDER_OBJECTS) $(OBJS)\render_sample.res
@%append $(OBJS)\render.lbc option quiet
@%append $(OBJS)\render.lbc name $^@
@%append $(OBJS)\render.lbc option caseexact
- @%append $(OBJS)\render.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\render.lbc library %i
@%append $(OBJS)\render.lbc option resource=$(OBJS)\render_sample.res
@@ -300,7 +300,7 @@ $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(WX_VERSION_NODOT)_wat.d
@%append $(OBJS)\renddll.lbc option quiet
@%append $(OBJS)\renddll.lbc name $^@
@%append $(OBJS)\renddll.lbc option caseexact
- @%append $(OBJS)\renddll.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME)
+ @%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) do @%append $(OBJS)\renddll.lbc library %i
@%append $(OBJS)\renddll.lbc
diff --git a/samples/render/render_vc7_renddll.vcproj b/samples/render/render_vc7_renddll.vcproj
index f13702c9f8..1482cd1387 100644
--- a/samples/render/render_vc7_renddll.vcproj
+++ b/samples/render/render_vc7_renddll.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,69 +22,59 @@
IntermediateDirectory="vc_mswunivudll\renddll"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\renddll\"
ObjectFile="vc_mswunivudll\renddll\"
ProgramDataBaseFileName="vc_mswunivudll\renddll_mswunivu290_vc.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\renddll_mswunivu290_vc.dll"
LinkIncremental="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\renddll_mswunivu290_vc.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\render_vc7_renddll.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -92,69 +82,62 @@
IntermediateDirectory="vc_mswunivuddll\renddll"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\renddll\"
ObjectFile="vc_mswunivuddll\renddll\"
ProgramDataBaseFileName="vc_mswunivuddll\renddll_mswunivud290_vc.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\renddll_mswunivud290_vc.dll"
LinkIncremental="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\renddll_mswunivud290_vc.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\render_vc7_renddll.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -162,69 +145,59 @@
IntermediateDirectory="vc_mswudll\renddll"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXUSINGDLL"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\renddll\"
ObjectFile="vc_mswudll\renddll\"
ProgramDataBaseFileName="vc_mswudll\renddll_mswu290_vc.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\renddll_mswu290_vc.dll"
LinkIncremental="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\renddll_mswu290_vc.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\render_vc7_renddll.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -232,69 +205,62 @@
IntermediateDirectory="vc_mswuddll\renddll"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\renddll\"
ObjectFile="vc_mswuddll\renddll\"
ProgramDataBaseFileName="vc_mswuddll\renddll_mswud290_vc.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\renddll_mswud290_vc.dll"
LinkIncremental="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\renddll_mswud290_vc.pdb"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\render_vc7_renddll.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -303,10 +269,11 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\renddll.cpp"/>
+ RelativePath=".\renddll.cpp">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/render/render_vc7_render.vcproj b/samples/render/render_vc7_render.vcproj
index f06c19016f..4787a98b7f 100644
--- a/samples/render/render_vc7_render.vcproj
+++ b/samples/render/render_vc7_render.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\render"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\render\"
ObjectFile="vc_mswunivudll\render\"
ProgramDataBaseFileName="vc_mswunivudll\render.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\render.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\render.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\render_vc7_render.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\render"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\render\"
ObjectFile="vc_mswunivuddll\render\"
ProgramDataBaseFileName="vc_mswunivuddll\render.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\render.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\render.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\render_vc7_render.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\render"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\render\"
ObjectFile="vc_mswudll\render\"
ProgramDataBaseFileName="vc_mswudll\render.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\render.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\render.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\render_vc7_render.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\render"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\render\"
ObjectFile="vc_mswuddll\render\"
ProgramDataBaseFileName="vc_mswuddll\render.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\render.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\render.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\render_vc7_render.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\render"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\render\"
ObjectFile="vc_mswunivu\render\"
ProgramDataBaseFileName="vc_mswunivu\render.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\render.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\render.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\render_vc7_render.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\render"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\render\"
ObjectFile="vc_mswunivud\render\"
ProgramDataBaseFileName="vc_mswunivud\render.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\render.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\render.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\render_vc7_render.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\render"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\render\"
ObjectFile="vc_mswu\render\"
ProgramDataBaseFileName="vc_mswu\render.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\render.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\render.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\render_vc7_render.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\render"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\render\"
ObjectFile="vc_mswud\render\"
ProgramDataBaseFileName="vc_mswud\render.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\render.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\render.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\render_vc7_render.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\render.cpp"/>
+ RelativePath=".\render.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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"/>
+ RelativePath=".\..\..\samples\sample.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/render/render_vc8_renddll.vcproj b/samples/render/render_vc8_renddll.vcproj
index 98ecadd2e0..98faaa3dd7 100644
--- a/samples/render/render_vc8_renddll.vcproj
+++ b/samples/render/render_vc8_renddll.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,44 +43,40 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\renddll\"
ObjectFile="vc_mswunivudll\renddll\"
ProgramDataBaseFileName="vc_mswunivudll\renddll_mswunivu290_vc.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\renddll_mswunivu290_vc.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -93,6 +89,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -130,44 +129,43 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\renddll\"
ObjectFile="vc_mswunivuddll\renddll\"
ProgramDataBaseFileName="vc_mswunivuddll\renddll_mswunivud290_vc.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\renddll_mswunivud290_vc.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -180,6 +178,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -217,44 +218,40 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include"
- MinimalRebuild="false"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXUSINGDLL"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXUSINGDLL"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\renddll\"
ObjectFile="vc_mswudll\renddll\"
ProgramDataBaseFileName="vc_mswudll\renddll_mswu290_vc.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\renddll_mswu290_vc.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -267,6 +264,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -304,44 +304,43 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include"
+ PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\renddll\"
ObjectFile="vc_mswuddll\renddll\"
ProgramDataBaseFileName="vc_mswuddll\renddll_mswud290_vc.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\renddll_mswud290_vc.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -354,6 +353,9 @@
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -376,12 +378,13 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\renddll.cpp"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/render/render_vc8_render.vcproj b/samples/render/render_vc8_render.vcproj
index 877fa9b06c..99df9055b8 100644
--- a/samples/render/render_vc8_render.vcproj
+++ b/samples/render/render_vc8_render.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\render\"
ObjectFile="vc_mswunivudll\render\"
ProgramDataBaseFileName="vc_mswunivudll\render.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\render.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\render.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\render\"
ObjectFile="vc_mswunivuddll\render\"
ProgramDataBaseFileName="vc_mswunivuddll\render.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\render.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\render.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\render\"
ObjectFile="vc_mswudll\render\"
ProgramDataBaseFileName="vc_mswudll\render.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\render.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\render.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\render\"
ObjectFile="vc_mswuddll\render\"
ProgramDataBaseFileName="vc_mswuddll\render.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\render.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\render.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\render\"
ObjectFile="vc_mswunivu\render\"
ProgramDataBaseFileName="vc_mswunivu\render.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\render.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\render.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\render\"
ObjectFile="vc_mswunivud\render\"
ProgramDataBaseFileName="vc_mswunivud\render.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\render.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\render.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\render\"
ObjectFile="vc_mswu\render\"
ProgramDataBaseFileName="vc_mswu\render.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\render.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\render.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\render\"
ObjectFile="vc_mswud\render\"
ProgramDataBaseFileName="vc_mswud\render.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\render.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\render.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\render.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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>
diff --git a/samples/richtext/Makefile.in b/samples/richtext/Makefile.in
index a9f4efd5af..77b485262b 100644
--- a/samples/richtext/Makefile.in
+++ b/samples/richtext/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -63,7 +63,7 @@ RICHTEXT_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -126,28 +126,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: richtext$(EXEEXT) $(__richtext_bundle___depname)
-install: all
+install:
uninstall:
@@ -163,7 +163,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
richtext$(EXEEXT): $(RICHTEXT_OBJECTS) $(__richtext___win32rc)
- $(CXX) -o $@ $(RICHTEXT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_RICHTEXT_p) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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)
+ $(CXX) -o $@ $(RICHTEXT_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_RICHTEXT_p) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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)
$(__richtext___mac_setfilecmd)
$(__richtext___os2_emxbindcmd)
@@ -208,6 +208,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean richtext_bundle
diff --git a/samples/richtext/makefile.bcc b/samples/richtext/makefile.bcc
index 98e7bd9fd7..02d9c4c711 100644
--- a/samples/richtext/makefile.bcc
+++ b/samples/richtext/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -245,7 +245,7 @@ clean:
-if exist $(OBJS)\richtext.ils del $(OBJS)\richtext.ils
$(OBJS)\richtext.exe: $(RICHTEXT_OBJECTS) $(OBJS)\richtext_sample.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/richtext/makefile.gcc b/samples/richtext/makefile.gcc
index f5d85feae7..37903c2a12 100644
--- a/samples/richtext/makefile.gcc
+++ b/samples/richtext/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -240,7 +240,7 @@ clean:
-if exist $(OBJS)\richtext.exe del $(OBJS)\richtext.exe
$(OBJS)\richtext.exe: $(RICHTEXT_OBJECTS) $(OBJS)\richtext_sample_rc.o
- $(CXX) -o $@ $(RICHTEXT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(OBJS)\richtext_richtext.o: ./richtext.cpp
$(CXX) -c -o $@ $(RICHTEXT_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/richtext/makefile.unx b/samples/richtext/makefile.unx
index e2387cedce..144d85c6c6 100644
--- a/samples/richtext/makefile.unx
+++ b/samples/richtext/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild richtext
-install: all
+install:
uninstall:
diff --git a/samples/richtext/makefile.vc b/samples/richtext/makefile.vc
index 266e17df84..65d9b9ebb7 100644
--- a/samples/richtext/makefile.vc
+++ b/samples/richtext/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -321,7 +321,7 @@ clean:
-if exist $(OBJS)\richtext.pdb del $(OBJS)\richtext.pdb
$(OBJS)\richtext.exe: $(RICHTEXT_OBJECTS) $(OBJS)\richtext_sample.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\richtext.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\richtext.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/richtext/makefile.wat b/samples/richtext/makefile.wat
index 32b730071e..39b3d63722 100644
--- a/samples/richtext/makefile.wat
+++ b/samples/richtext/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -271,7 +271,7 @@ $(OBJS)\richtext.exe : $(RICHTEXT_OBJECTS) $(OBJS)\richtext_sample.res
@%append $(OBJS)\richtext.lbc option quiet
@%append $(OBJS)\richtext.lbc name $^@
@%append $(OBJS)\richtext.lbc option caseexact
- @%append $(OBJS)\richtext.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\richtext.lbc library %i
@%append $(OBJS)\richtext.lbc option resource=$(OBJS)\richtext_sample.res
diff --git a/samples/richtext/richtext_vc7.vcproj b/samples/richtext/richtext_vc7.vcproj
index ac243b51d4..01a79ecd7a 100644
--- a/samples/richtext/richtext_vc7.vcproj
+++ b/samples/richtext/richtext_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\richtext"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\richtext\"
ObjectFile="vc_mswunivudll\richtext\"
ProgramDataBaseFileName="vc_mswunivudll\richtext.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\richtext.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\richtext.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\richtext_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\richtext"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\richtext\"
ObjectFile="vc_mswunivuddll\richtext\"
ProgramDataBaseFileName="vc_mswunivuddll\richtext.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_richtext.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxmswuniv29ud_core.lib wxbase29ud_xml.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_richtext.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxmswuniv29ud_core.lib wxbase29ud_xml.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"
OutputFile="vc_mswunivuddll\richtext.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\richtext.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\richtext_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\richtext"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\richtext\"
ObjectFile="vc_mswudll\richtext\"
ProgramDataBaseFileName="vc_mswudll\richtext.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\richtext.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\richtext.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\richtext_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\richtext"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\richtext\"
ObjectFile="vc_mswuddll\richtext\"
ProgramDataBaseFileName="vc_mswuddll\richtext.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_richtext.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxmsw29ud_core.lib wxbase29ud_xml.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_richtext.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxmsw29ud_core.lib wxbase29ud_xml.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"
OutputFile="vc_mswuddll\richtext.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\richtext.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\richtext_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\richtext"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\richtext\"
ObjectFile="vc_mswunivu\richtext\"
ProgramDataBaseFileName="vc_mswunivu\richtext.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\richtext.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\richtext.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\richtext_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\richtext"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\richtext\"
ObjectFile="vc_mswunivud\richtext\"
ProgramDataBaseFileName="vc_mswunivud\richtext.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_richtext.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxmswuniv29ud_core.lib wxbase29ud_xml.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_richtext.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxmswuniv29ud_core.lib wxbase29ud_xml.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"
OutputFile="vc_mswunivud\richtext.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\richtext.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\richtext_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\richtext"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\richtext\"
ObjectFile="vc_mswu\richtext\"
ProgramDataBaseFileName="vc_mswu\richtext.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\richtext.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\richtext.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\richtext_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\richtext"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\richtext\"
ObjectFile="vc_mswud\richtext\"
ProgramDataBaseFileName="vc_mswud\richtext.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_richtext.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxmsw29ud_core.lib wxbase29ud_xml.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_richtext.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxmsw29ud_core.lib wxbase29ud_xml.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"
OutputFile="vc_mswud\richtext.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\richtext.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\richtext_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\richtext.cpp"/>
+ RelativePath=".\richtext.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\..\sample.rc"/>
+ RelativePath=".\..\sample.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/richtext/richtext_vc8.vcproj b/samples/richtext/richtext_vc8.vcproj
index 7f8b45ebc5..d9e6154e72 100644
--- a/samples/richtext/richtext_vc8.vcproj
+++ b/samples/richtext/richtext_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\richtext\"
ObjectFile="vc_mswunivudll\richtext\"
ProgramDataBaseFileName="vc_mswunivudll\richtext.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\richtext.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\richtext.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\richtext\"
ObjectFile="vc_mswunivuddll\richtext\"
ProgramDataBaseFileName="vc_mswunivuddll\richtext.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_richtext.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxmswuniv29ud_core.lib wxbase29ud_xml.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_richtext.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxmswuniv29ud_core.lib wxbase29ud_xml.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"
OutputFile="vc_mswunivuddll\richtext.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\richtext.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\richtext\"
ObjectFile="vc_mswudll\richtext\"
ProgramDataBaseFileName="vc_mswudll\richtext.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\richtext.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\richtext.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\richtext\"
ObjectFile="vc_mswuddll\richtext\"
ProgramDataBaseFileName="vc_mswuddll\richtext.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_richtext.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxmsw29ud_core.lib wxbase29ud_xml.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_richtext.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxmsw29ud_core.lib wxbase29ud_xml.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"
OutputFile="vc_mswuddll\richtext.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\richtext.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\richtext\"
ObjectFile="vc_mswunivu\richtext\"
ProgramDataBaseFileName="vc_mswunivu\richtext.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\richtext.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\richtext.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\richtext\"
ObjectFile="vc_mswunivud\richtext\"
ProgramDataBaseFileName="vc_mswunivud\richtext.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_richtext.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxmswuniv29ud_core.lib wxbase29ud_xml.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_richtext.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxmswuniv29ud_core.lib wxbase29ud_xml.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"
OutputFile="vc_mswunivud\richtext.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\richtext.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\richtext\"
ObjectFile="vc_mswu\richtext\"
ProgramDataBaseFileName="vc_mswu\richtext.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\richtext.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\richtext.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\richtext\"
ObjectFile="vc_mswud\richtext\"
ProgramDataBaseFileName="vc_mswud\richtext.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_richtext.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxmsw29ud_core.lib wxbase29ud_xml.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_richtext.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxmsw29ud_core.lib wxbase29ud_xml.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"
OutputFile="vc_mswud\richtext.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\richtext.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\richtext.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\..\sample.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/sashtest/Makefile.in b/samples/sashtest/Makefile.in
index 96e13a520d..66f10e9092 100644
--- a/samples/sashtest/Makefile.in
+++ b/samples/sashtest/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -61,7 +61,7 @@ SASHTEST_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -115,28 +115,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: sashtest$(EXEEXT) $(__sashtest_bundle___depname)
-install: all
+install:
uninstall:
@@ -152,7 +152,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
sashtest$(EXEEXT): $(SASHTEST_OBJECTS) $(__sashtest___win32rc)
- $(CXX) -o $@ $(SASHTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
+ $(CXX) -o $@ $(SASHTEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
$(__sashtest___mac_setfilecmd)
$(__sashtest___os2_emxbindcmd)
@@ -197,6 +197,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean sashtest_bundle
diff --git a/samples/sashtest/makefile.bcc b/samples/sashtest/makefile.bcc
index b281e9dddd..22aa7b5993 100644
--- a/samples/sashtest/makefile.bcc
+++ b/samples/sashtest/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -233,7 +233,7 @@ clean:
-if exist $(OBJS)\sashtest.ils del $(OBJS)\sashtest.ils
$(OBJS)\sashtest.exe: $(SASHTEST_OBJECTS) $(OBJS)\sashtest_sashtest.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/sashtest/makefile.gcc b/samples/sashtest/makefile.gcc
index 6d8c56d546..9e18d1ceb7 100644
--- a/samples/sashtest/makefile.gcc
+++ b/samples/sashtest/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -228,7 +228,7 @@ clean:
-if exist $(OBJS)\sashtest.exe del $(OBJS)\sashtest.exe
$(OBJS)\sashtest.exe: $(SASHTEST_OBJECTS) $(OBJS)\sashtest_sashtest_rc.o
- $(CXX) -o $@ $(SASHTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(OBJS)\sashtest_sashtest.o: ./sashtest.cpp
$(CXX) -c -o $@ $(SASHTEST_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/sashtest/makefile.unx b/samples/sashtest/makefile.unx
index 9dfaa0bab4..87689e6757 100644
--- a/samples/sashtest/makefile.unx
+++ b/samples/sashtest/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild sashtest
-install: all
+install:
uninstall:
diff --git a/samples/sashtest/makefile.vc b/samples/sashtest/makefile.vc
index 4b6e775984..b93eb77e17 100644
--- a/samples/sashtest/makefile.vc
+++ b/samples/sashtest/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -309,7 +309,7 @@ clean:
-if exist $(OBJS)\sashtest.pdb del $(OBJS)\sashtest.pdb
$(OBJS)\sashtest.exe: $(SASHTEST_OBJECTS) $(OBJS)\sashtest_sashtest.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\sashtest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\sashtest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/sashtest/makefile.wat b/samples/sashtest/makefile.wat
index c138358ed7..6671311e17 100644
--- a/samples/sashtest/makefile.wat
+++ b/samples/sashtest/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -256,7 +256,7 @@ $(OBJS)\sashtest.exe : $(SASHTEST_OBJECTS) $(OBJS)\sashtest_sashtest.res
@%append $(OBJS)\sashtest.lbc option quiet
@%append $(OBJS)\sashtest.lbc name $^@
@%append $(OBJS)\sashtest.lbc option caseexact
- @%append $(OBJS)\sashtest.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\sashtest.lbc library %i
@%append $(OBJS)\sashtest.lbc option resource=$(OBJS)\sashtest_sashtest.res
diff --git a/samples/sashtest/sashtest_vc7.vcproj b/samples/sashtest/sashtest_vc7.vcproj
index d3fcbec110..1d8f7e3ada 100644
--- a/samples/sashtest/sashtest_vc7.vcproj
+++ b/samples/sashtest/sashtest_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\sashtest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\sashtest\"
ObjectFile="vc_mswunivudll\sashtest\"
ProgramDataBaseFileName="vc_mswunivudll\sashtest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\sashtest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\sashtest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\sashtest_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\sashtest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\sashtest\"
ObjectFile="vc_mswunivuddll\sashtest\"
ProgramDataBaseFileName="vc_mswunivuddll\sashtest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivuddll\sashtest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\sashtest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\sashtest_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\sashtest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\sashtest\"
ObjectFile="vc_mswudll\sashtest\"
ProgramDataBaseFileName="vc_mswudll\sashtest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\sashtest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\sashtest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\sashtest_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\sashtest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\sashtest\"
ObjectFile="vc_mswuddll\sashtest\"
ProgramDataBaseFileName="vc_mswuddll\sashtest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswuddll\sashtest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\sashtest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\sashtest_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\sashtest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\sashtest\"
ObjectFile="vc_mswunivu\sashtest\"
ProgramDataBaseFileName="vc_mswunivu\sashtest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\sashtest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\sashtest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\sashtest_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\sashtest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\sashtest\"
ObjectFile="vc_mswunivud\sashtest\"
ProgramDataBaseFileName="vc_mswunivud\sashtest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivud\sashtest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\sashtest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\sashtest_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\sashtest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\sashtest\"
ObjectFile="vc_mswu\sashtest\"
ProgramDataBaseFileName="vc_mswu\sashtest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\sashtest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\sashtest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\sashtest_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\sashtest"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\sashtest\"
ObjectFile="vc_mswud\sashtest\"
ProgramDataBaseFileName="vc_mswud\sashtest.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswud\sashtest.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\sashtest.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\sashtest_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\sashtest.cpp"/>
+ RelativePath=".\sashtest.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\sashtest.rc"/>
+ RelativePath=".\sashtest.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/sashtest/sashtest_vc8.vcproj b/samples/sashtest/sashtest_vc8.vcproj
index 3d25b1265a..ab4af1d81a 100644
--- a/samples/sashtest/sashtest_vc8.vcproj
+++ b/samples/sashtest/sashtest_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\sashtest\"
ObjectFile="vc_mswunivudll\sashtest\"
ProgramDataBaseFileName="vc_mswunivudll\sashtest.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\sashtest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\sashtest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\sashtest\"
ObjectFile="vc_mswunivuddll\sashtest\"
ProgramDataBaseFileName="vc_mswunivuddll\sashtest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivuddll\sashtest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\sashtest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\sashtest\"
ObjectFile="vc_mswudll\sashtest\"
ProgramDataBaseFileName="vc_mswudll\sashtest.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\sashtest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\sashtest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\sashtest\"
ObjectFile="vc_mswuddll\sashtest\"
ProgramDataBaseFileName="vc_mswuddll\sashtest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswuddll\sashtest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\sashtest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\sashtest\"
ObjectFile="vc_mswunivu\sashtest\"
ProgramDataBaseFileName="vc_mswunivu\sashtest.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\sashtest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\sashtest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\sashtest\"
ObjectFile="vc_mswunivud\sashtest\"
ProgramDataBaseFileName="vc_mswunivud\sashtest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivud\sashtest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\sashtest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\sashtest\"
ObjectFile="vc_mswu\sashtest\"
ProgramDataBaseFileName="vc_mswu\sashtest.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\sashtest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\sashtest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\sashtest\"
ObjectFile="vc_mswud\sashtest\"
ProgramDataBaseFileName="vc_mswud\sashtest.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswud\sashtest.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\sashtest.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\sashtest.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\sashtest.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/scroll/Makefile.in b/samples/scroll/Makefile.in
index aa4bdaede7..ee66311e6d 100644
--- a/samples/scroll/Makefile.in
+++ b/samples/scroll/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ SCROLL_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: scroll$(EXEEXT) $(__scroll_bundle___depname)
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
scroll$(EXEEXT): $(SCROLL_OBJECTS) $(__scroll___win32rc)
- $(CXX) -o $@ $(SCROLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(SCROLL_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)
$(__scroll___mac_setfilecmd)
$(__scroll___os2_emxbindcmd)
@@ -192,6 +192,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean scroll_bundle
diff --git a/samples/scroll/makefile.bcc b/samples/scroll/makefile.bcc
index cf26deac24..adff7c98ad 100644
--- a/samples/scroll/makefile.bcc
+++ b/samples/scroll/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\scroll.ils del $(OBJS)\scroll.ils
$(OBJS)\scroll.exe: $(SCROLL_OBJECTS) $(OBJS)\scroll_scroll.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/scroll/makefile.gcc b/samples/scroll/makefile.gcc
index 82c4c51eec..238f9a3a94 100644
--- a/samples/scroll/makefile.gcc
+++ b/samples/scroll/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\scroll.exe del $(OBJS)\scroll.exe
$(OBJS)\scroll.exe: $(SCROLL_OBJECTS) $(OBJS)\scroll_scroll_rc.o
- $(CXX) -o $@ $(SCROLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(OBJS)\scroll_scroll.o: ./scroll.cpp
$(CXX) -c -o $@ $(SCROLL_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/scroll/makefile.unx b/samples/scroll/makefile.unx
index 107eef7562..202229d314 100644
--- a/samples/scroll/makefile.unx
+++ b/samples/scroll/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild scroll
-install: all
+install:
uninstall:
diff --git a/samples/scroll/makefile.vc b/samples/scroll/makefile.vc
index 89cb23f4df..d843a768c7 100644
--- a/samples/scroll/makefile.vc
+++ b/samples/scroll/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\scroll.pdb del $(OBJS)\scroll.pdb
$(OBJS)\scroll.exe: $(SCROLL_OBJECTS) $(OBJS)\scroll_scroll.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\scroll.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\scroll.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/scroll/makefile.wat b/samples/scroll/makefile.wat
index 86368197bf..4c76dc5354 100644
--- a/samples/scroll/makefile.wat
+++ b/samples/scroll/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\scroll.exe : $(SCROLL_OBJECTS) $(OBJS)\scroll_scroll.res
@%append $(OBJS)\scroll.lbc option quiet
@%append $(OBJS)\scroll.lbc name $^@
@%append $(OBJS)\scroll.lbc option caseexact
- @%append $(OBJS)\scroll.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\scroll.lbc library %i
@%append $(OBJS)\scroll.lbc option resource=$(OBJS)\scroll_scroll.res
diff --git a/samples/scroll/scroll_vc7.vcproj b/samples/scroll/scroll_vc7.vcproj
index f6cf65a914..7dc1f694a4 100644
--- a/samples/scroll/scroll_vc7.vcproj
+++ b/samples/scroll/scroll_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\scroll"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\scroll\"
ObjectFile="vc_mswunivudll\scroll\"
ProgramDataBaseFileName="vc_mswunivudll\scroll.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\scroll.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\scroll.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\scroll_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\scroll"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\scroll\"
ObjectFile="vc_mswunivuddll\scroll\"
ProgramDataBaseFileName="vc_mswunivuddll\scroll.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\scroll.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\scroll.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\scroll_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\scroll"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\scroll\"
ObjectFile="vc_mswudll\scroll\"
ProgramDataBaseFileName="vc_mswudll\scroll.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\scroll.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\scroll.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\scroll_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\scroll"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\scroll\"
ObjectFile="vc_mswuddll\scroll\"
ProgramDataBaseFileName="vc_mswuddll\scroll.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\scroll.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\scroll.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\scroll_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\scroll"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\scroll\"
ObjectFile="vc_mswunivu\scroll\"
ProgramDataBaseFileName="vc_mswunivu\scroll.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\scroll.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\scroll.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\scroll_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\scroll"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\scroll\"
ObjectFile="vc_mswunivud\scroll\"
ProgramDataBaseFileName="vc_mswunivud\scroll.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\scroll.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\scroll.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\scroll_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\scroll"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\scroll\"
ObjectFile="vc_mswu\scroll\"
ProgramDataBaseFileName="vc_mswu\scroll.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\scroll.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\scroll.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\scroll_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\scroll"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\scroll\"
ObjectFile="vc_mswud\scroll\"
ProgramDataBaseFileName="vc_mswud\scroll.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\scroll.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\scroll.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\scroll_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\scroll.cpp"/>
+ RelativePath=".\scroll.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\scroll.rc"/>
+ RelativePath=".\scroll.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/scroll/scroll_vc8.vcproj b/samples/scroll/scroll_vc8.vcproj
index b47e771417..36201a049a 100644
--- a/samples/scroll/scroll_vc8.vcproj
+++ b/samples/scroll/scroll_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\scroll\"
ObjectFile="vc_mswunivudll\scroll\"
ProgramDataBaseFileName="vc_mswunivudll\scroll.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\scroll.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\scroll.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\scroll\"
ObjectFile="vc_mswunivuddll\scroll\"
ProgramDataBaseFileName="vc_mswunivuddll\scroll.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\scroll.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\scroll.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\scroll\"
ObjectFile="vc_mswudll\scroll\"
ProgramDataBaseFileName="vc_mswudll\scroll.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\scroll.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\scroll.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\scroll\"
ObjectFile="vc_mswuddll\scroll\"
ProgramDataBaseFileName="vc_mswuddll\scroll.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\scroll.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\scroll.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\scroll\"
ObjectFile="vc_mswunivu\scroll\"
ProgramDataBaseFileName="vc_mswunivu\scroll.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\scroll.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\scroll.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\scroll\"
ObjectFile="vc_mswunivud\scroll\"
ProgramDataBaseFileName="vc_mswunivud\scroll.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\scroll.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\scroll.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\scroll\"
ObjectFile="vc_mswu\scroll\"
ProgramDataBaseFileName="vc_mswu\scroll.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\scroll.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\scroll.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\scroll\"
ObjectFile="vc_mswud\scroll\"
ProgramDataBaseFileName="vc_mswud\scroll.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\scroll.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\scroll.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\scroll.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\scroll.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/scrollsub/Makefile.in b/samples/scrollsub/Makefile.in
index bfeadb0cb3..3061992bb1 100644
--- a/samples/scrollsub/Makefile.in
+++ b/samples/scrollsub/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ SCROLLSUB_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: scrollsub$(EXEEXT) $(__scrollsub_bundle___depname)
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
scrollsub$(EXEEXT): $(SCROLLSUB_OBJECTS) $(__scrollsub___win32rc)
- $(CXX) -o $@ $(SCROLLSUB_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(SCROLLSUB_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)
$(__scrollsub___mac_setfilecmd)
$(__scrollsub___os2_emxbindcmd)
@@ -192,6 +192,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean scrollsub_bundle
diff --git a/samples/scrollsub/makefile.bcc b/samples/scrollsub/makefile.bcc
index 4c59b00cec..a78a941cad 100644
--- a/samples/scrollsub/makefile.bcc
+++ b/samples/scrollsub/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\scrollsub.ils del $(OBJS)\scrollsub.ils
$(OBJS)\scrollsub.exe: $(SCROLLSUB_OBJECTS) $(OBJS)\scrollsub_scrollsub.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
c0w32.obj $(SCROLLSUB_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)\scrollsub_scrollsub.res
|
diff --git a/samples/scrollsub/makefile.gcc b/samples/scrollsub/makefile.gcc
index 377eb1e449..61000ed004 100644
--- a/samples/scrollsub/makefile.gcc
+++ b/samples/scrollsub/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\scrollsub.exe del $(OBJS)\scrollsub.exe
$(OBJS)\scrollsub.exe: $(SCROLLSUB_OBJECTS) $(OBJS)\scrollsub_scrollsub_rc.o
- $(CXX) -o $@ $(SCROLLSUB_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(CXX) -o $@ $(SCROLLSUB_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
$(OBJS)\scrollsub_scrollsub.o: ./scrollsub.cpp
$(CXX) -c -o $@ $(SCROLLSUB_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/scrollsub/makefile.unx b/samples/scrollsub/makefile.unx
index 27dcb835fb..4997217799 100644
--- a/samples/scrollsub/makefile.unx
+++ b/samples/scrollsub/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild scrollsub
-install: all
+install:
uninstall:
diff --git a/samples/scrollsub/makefile.vc b/samples/scrollsub/makefile.vc
index 9098627413..f4c02b0de8 100644
--- a/samples/scrollsub/makefile.vc
+++ b/samples/scrollsub/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\scrollsub.pdb del $(OBJS)\scrollsub.pdb
$(OBJS)\scrollsub.exe: $(SCROLLSUB_OBJECTS) $(OBJS)\scrollsub_scrollsub.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\scrollsub.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\scrollsub.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(SCROLLSUB_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
<<
diff --git a/samples/scrollsub/makefile.wat b/samples/scrollsub/makefile.wat
index 1c0c961115..dd7a2c27e8 100644
--- a/samples/scrollsub/makefile.wat
+++ b/samples/scrollsub/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\scrollsub.exe : $(SCROLLSUB_OBJECTS) $(OBJS)\scrollsub_scrollsub.res
@%append $(OBJS)\scrollsub.lbc option quiet
@%append $(OBJS)\scrollsub.lbc name $^@
@%append $(OBJS)\scrollsub.lbc option caseexact
- @%append $(OBJS)\scrollsub.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%append $(OBJS)\scrollsub.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
@for %i in ($(SCROLLSUB_OBJECTS)) do @%append $(OBJS)\scrollsub.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) do @%append $(OBJS)\scrollsub.lbc library %i
@%append $(OBJS)\scrollsub.lbc option resource=$(OBJS)\scrollsub_scrollsub.res
diff --git a/samples/scrollsub/scrollsub_vc7.vcproj b/samples/scrollsub/scrollsub_vc7.vcproj
index 965dfc143c..5de85c3f8e 100644
--- a/samples/scrollsub/scrollsub_vc7.vcproj
+++ b/samples/scrollsub/scrollsub_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\scrollsub"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\scrollsub\"
ObjectFile="vc_mswunivudll\scrollsub\"
ProgramDataBaseFileName="vc_mswunivudll\scrollsub.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\scrollsub.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\scrollsub.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\scrollsub_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\scrollsub"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\scrollsub\"
ObjectFile="vc_mswunivuddll\scrollsub\"
ProgramDataBaseFileName="vc_mswunivuddll\scrollsub.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\scrollsub.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\scrollsub.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\scrollsub_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\scrollsub"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\scrollsub\"
ObjectFile="vc_mswudll\scrollsub\"
ProgramDataBaseFileName="vc_mswudll\scrollsub.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\scrollsub.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\scrollsub.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\scrollsub_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\scrollsub"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\scrollsub\"
ObjectFile="vc_mswuddll\scrollsub\"
ProgramDataBaseFileName="vc_mswuddll\scrollsub.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\scrollsub.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\scrollsub.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\scrollsub_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\scrollsub"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\scrollsub\"
ObjectFile="vc_mswunivu\scrollsub\"
ProgramDataBaseFileName="vc_mswunivu\scrollsub.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\scrollsub.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\scrollsub.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\scrollsub_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\scrollsub"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\scrollsub\"
ObjectFile="vc_mswunivud\scrollsub\"
ProgramDataBaseFileName="vc_mswunivud\scrollsub.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\scrollsub.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\scrollsub.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\scrollsub_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\scrollsub"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\scrollsub\"
ObjectFile="vc_mswu\scrollsub\"
ProgramDataBaseFileName="vc_mswu\scrollsub.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\scrollsub.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\scrollsub.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\scrollsub_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\scrollsub"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\scrollsub\"
ObjectFile="vc_mswud\scrollsub\"
ProgramDataBaseFileName="vc_mswud\scrollsub.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\scrollsub.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\scrollsub.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\scrollsub_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\scrollsub.cpp"/>
+ RelativePath=".\scrollsub.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\scrollsub.rc"/>
+ RelativePath=".\scrollsub.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/scrollsub/scrollsub_vc8.vcproj b/samples/scrollsub/scrollsub_vc8.vcproj
index c3c5fee35b..3732dc57e3 100644
--- a/samples/scrollsub/scrollsub_vc8.vcproj
+++ b/samples/scrollsub/scrollsub_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\scrollsub\"
ObjectFile="vc_mswunivudll\scrollsub\"
ProgramDataBaseFileName="vc_mswunivudll\scrollsub.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\scrollsub.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\scrollsub.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\scrollsub\"
ObjectFile="vc_mswunivuddll\scrollsub\"
ProgramDataBaseFileName="vc_mswunivuddll\scrollsub.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\scrollsub.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\scrollsub.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\scrollsub\"
ObjectFile="vc_mswudll\scrollsub\"
ProgramDataBaseFileName="vc_mswudll\scrollsub.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\scrollsub.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\scrollsub.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\scrollsub\"
ObjectFile="vc_mswuddll\scrollsub\"
ProgramDataBaseFileName="vc_mswuddll\scrollsub.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\scrollsub.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\scrollsub.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\scrollsub\"
ObjectFile="vc_mswunivu\scrollsub\"
ProgramDataBaseFileName="vc_mswunivu\scrollsub.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\scrollsub.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\scrollsub.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\scrollsub\"
ObjectFile="vc_mswunivud\scrollsub\"
ProgramDataBaseFileName="vc_mswunivud\scrollsub.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\scrollsub.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\scrollsub.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\scrollsub\"
ObjectFile="vc_mswu\scrollsub\"
ProgramDataBaseFileName="vc_mswu\scrollsub.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\scrollsub.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\scrollsub.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\scrollsub\"
ObjectFile="vc_mswud\scrollsub\"
ProgramDataBaseFileName="vc_mswud\scrollsub.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\scrollsub.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\scrollsub.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\scrollsub.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\scrollsub.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/shaped/Makefile.in b/samples/shaped/Makefile.in
index 0e6b374cdd..e3fab6ad80 100644
--- a/samples/shaped/Makefile.in
+++ b/samples/shaped/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ SHAPED_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: shaped$(EXEEXT) $(__shaped_bundle___depname) data
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
shaped$(EXEEXT): $(SHAPED_OBJECTS) $(__shaped___win32rc)
- $(CXX) -o $@ $(SHAPED_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(SHAPED_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)
$(__shaped___mac_setfilecmd)
$(__shaped___os2_emxbindcmd)
@@ -204,6 +204,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean shaped_bundle data
diff --git a/samples/shaped/makefile.bcc b/samples/shaped/makefile.bcc
index 4df1888348..ea4af80253 100644
--- a/samples/shaped/makefile.bcc
+++ b/samples/shaped/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\shaped.ils del $(OBJS)\shaped.ils
$(OBJS)\shaped.exe: $(SHAPED_OBJECTS) $(OBJS)\shaped_shaped.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/shaped/makefile.gcc b/samples/shaped/makefile.gcc
index 8d6f311b89..de719d4e34 100644
--- a/samples/shaped/makefile.gcc
+++ b/samples/shaped/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\shaped.exe del $(OBJS)\shaped.exe
$(OBJS)\shaped.exe: $(SHAPED_OBJECTS) $(OBJS)\shaped_shaped_rc.o
- $(CXX) -o $@ $(SHAPED_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
data:
if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/shaped/makefile.unx b/samples/shaped/makefile.unx
index d152849baa..442e182458 100644
--- a/samples/shaped/makefile.unx
+++ b/samples/shaped/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild shaped
-install: all
+install:
uninstall:
diff --git a/samples/shaped/makefile.vc b/samples/shaped/makefile.vc
index 2484daa972..61ccf0728d 100644
--- a/samples/shaped/makefile.vc
+++ b/samples/shaped/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\shaped.pdb del $(OBJS)\shaped.pdb
$(OBJS)\shaped.exe: $(SHAPED_OBJECTS) $(OBJS)\shaped_shaped.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\shaped.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\shaped.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/shaped/makefile.wat b/samples/shaped/makefile.wat
index 571d48ba42..d52ea2fc0e 100644
--- a/samples/shaped/makefile.wat
+++ b/samples/shaped/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\shaped.exe : $(SHAPED_OBJECTS) $(OBJS)\shaped_shaped.res
@%append $(OBJS)\shaped.lbc option quiet
@%append $(OBJS)\shaped.lbc name $^@
@%append $(OBJS)\shaped.lbc option caseexact
- @%append $(OBJS)\shaped.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\shaped.lbc library %i
@%append $(OBJS)\shaped.lbc option resource=$(OBJS)\shaped_shaped.res
diff --git a/samples/shaped/shaped_vc7.vcproj b/samples/shaped/shaped_vc7.vcproj
index a343b2e9c3..08768eb4fa 100644
--- a/samples/shaped/shaped_vc7.vcproj
+++ b/samples/shaped/shaped_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\shaped"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\shaped\"
ObjectFile="vc_mswunivudll\shaped\"
ProgramDataBaseFileName="vc_mswunivudll\shaped.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\shaped.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\shaped.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\shaped_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\shaped"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\shaped\"
ObjectFile="vc_mswunivuddll\shaped\"
ProgramDataBaseFileName="vc_mswunivuddll\shaped.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\shaped.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\shaped.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\shaped_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\shaped"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\shaped\"
ObjectFile="vc_mswudll\shaped\"
ProgramDataBaseFileName="vc_mswudll\shaped.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\shaped.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\shaped.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\shaped_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\shaped"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\shaped\"
ObjectFile="vc_mswuddll\shaped\"
ProgramDataBaseFileName="vc_mswuddll\shaped.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\shaped.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\shaped.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\shaped_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\shaped"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\shaped\"
ObjectFile="vc_mswunivu\shaped\"
ProgramDataBaseFileName="vc_mswunivu\shaped.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\shaped.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\shaped.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\shaped_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\shaped"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\shaped\"
ObjectFile="vc_mswunivud\shaped\"
ProgramDataBaseFileName="vc_mswunivud\shaped.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\shaped.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\shaped.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\shaped_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\shaped"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\shaped\"
ObjectFile="vc_mswu\shaped\"
ProgramDataBaseFileName="vc_mswu\shaped.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\shaped.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\shaped.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\shaped_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\shaped"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\shaped\"
ObjectFile="vc_mswud\shaped\"
ProgramDataBaseFileName="vc_mswud\shaped.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\shaped.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\shaped.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\shaped_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\shaped.cpp"/>
+ RelativePath=".\shaped.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\shaped.rc"/>
+ RelativePath=".\shaped.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/shaped/shaped_vc8.vcproj b/samples/shaped/shaped_vc8.vcproj
index 331db6f795..f39ba6d4d8 100644
--- a/samples/shaped/shaped_vc8.vcproj
+++ b/samples/shaped/shaped_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\shaped\"
ObjectFile="vc_mswunivudll\shaped\"
ProgramDataBaseFileName="vc_mswunivudll\shaped.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\shaped.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\shaped.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\shaped\"
ObjectFile="vc_mswunivuddll\shaped\"
ProgramDataBaseFileName="vc_mswunivuddll\shaped.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\shaped.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\shaped.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\shaped\"
ObjectFile="vc_mswudll\shaped\"
ProgramDataBaseFileName="vc_mswudll\shaped.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\shaped.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\shaped.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\shaped\"
ObjectFile="vc_mswuddll\shaped\"
ProgramDataBaseFileName="vc_mswuddll\shaped.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\shaped.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\shaped.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\shaped\"
ObjectFile="vc_mswunivu\shaped\"
ProgramDataBaseFileName="vc_mswunivu\shaped.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\shaped.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\shaped.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\shaped\"
ObjectFile="vc_mswunivud\shaped\"
ProgramDataBaseFileName="vc_mswunivud\shaped.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\shaped.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\shaped.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\shaped\"
ObjectFile="vc_mswu\shaped\"
ProgramDataBaseFileName="vc_mswu\shaped.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\shaped.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\shaped.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\shaped\"
ObjectFile="vc_mswud\shaped\"
ProgramDataBaseFileName="vc_mswud\shaped.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\shaped.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\shaped.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\shaped.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\shaped.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in
index 0ab3bb16c5..a10a86cc31 100644
--- a/samples/sockets/Makefile.in
+++ b/samples/sockets/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -79,7 +79,7 @@ BASESERVER_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -146,15 +146,15 @@ COND_PLATFORM_OS2_1___server___os2_emxbindcmd = $(NM) server$(EXEEXT) | if grep
COND_MONOLITHIC_0___WXLIB_CORE_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
@@ -169,19 +169,19 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: $(__client___depname) $(__client_bundle___depname) $(__server___depname) $(__server_bundle___depname) baseclient$(EXEEXT) baseserver$(EXEEXT)
-install: all
+install:
uninstall:
@@ -201,7 +201,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
@COND_USE_GUI_1@client$(EXEEXT): $(CLIENT_OBJECTS) $(__client___win32rc)
-@COND_USE_GUI_1@ $(CXX) -o $@ $(CLIENT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_NET_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)
+@COND_USE_GUI_1@ $(CXX) -o $@ $(CLIENT_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_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)
@COND_USE_GUI_1@
@COND_USE_GUI_1@ $(__client___mac_setfilecmd)
@COND_USE_GUI_1@ $(__client___os2_emxbindcmd)
@@ -230,7 +230,7 @@ distclean: clean
@COND_PLATFORM_MACOSX_1_USE_GUI_1@client_bundle: $(____client_BUNDLE_TGT_REF_DEP)
@COND_USE_GUI_1@server$(EXEEXT): $(SERVER_OBJECTS) $(__server___win32rc)
-@COND_USE_GUI_1@ $(CXX) -o $@ $(SERVER_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_NET_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)
+@COND_USE_GUI_1@ $(CXX) -o $@ $(SERVER_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_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)
@COND_USE_GUI_1@
@COND_USE_GUI_1@ $(__server___mac_setfilecmd)
@COND_USE_GUI_1@ $(__server___os2_emxbindcmd)
@@ -259,13 +259,13 @@ distclean: clean
@COND_PLATFORM_MACOSX_1_USE_GUI_1@server_bundle: $(____server_BUNDLE_TGT_REF_DEP)
baseclient$(EXEEXT): $(BASECLIENT_OBJECTS)
- $(CXX) -o $@ $(BASECLIENT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+ $(CXX) -o $@ $(BASECLIENT_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
$(__baseclient___mac_setfilecmd)
$(SAMPLES_RPATH_POSTLINK)
baseserver$(EXEEXT): $(BASESERVER_OBJECTS)
- $(CXX) -o $@ $(BASESERVER_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+ $(CXX) -o $@ $(BASESERVER_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
$(__baseserver___mac_setfilecmd)
$(SAMPLES_RPATH_POSTLINK)
@@ -299,6 +299,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean client_bundle server_bundle
diff --git a/samples/sockets/makefile.bcc b/samples/sockets/makefile.bcc
index 8258b4b051..da45f87f3c 100644
--- a/samples/sockets/makefile.bcc
+++ b/samples/sockets/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -282,25 +282,25 @@ clean:
!if "$(USE_GUI)" == "1"
$(OBJS)\client.exe: $(CLIENT_OBJECTS) $(OBJS)\client_client.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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 $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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 $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap @&&|
+ 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 $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap @&&|
+ 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,,
|
diff --git a/samples/sockets/makefile.gcc b/samples/sockets/makefile.gcc
index 0523c13326..7ac19f123c 100644
--- a/samples/sockets/makefile.gcc
+++ b/samples/sockets/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -266,19 +266,19 @@ clean:
ifeq ($(USE_GUI),1)
$(OBJS)\client.exe: $(CLIENT_OBJECTS) $(OBJS)\client_client_rc.o
- $(CXX) -o $@ $(CLIENT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
endif
ifeq ($(USE_GUI),1)
$(OBJS)\server.exe: $(SERVER_OBJECTS) $(OBJS)\server_server_rc.o
- $(CXX) -o $@ $(SERVER_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
endif
$(OBJS)\baseclient.exe: $(BASECLIENT_OBJECTS)
- $(CXX) -o $@ $(BASECLIENT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(__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
+ $(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
$(OBJS)\baseserver.exe: $(BASESERVER_OBJECTS)
- $(CXX) -o $@ $(BASESERVER_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(__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
+ $(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
$(OBJS)\client_client.o: ./client.cpp
$(CXX) -c -o $@ $(CLIENT_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/sockets/makefile.unx b/samples/sockets/makefile.unx
index 1082f97fcd..e1a52ef658 100644
--- a/samples/sockets/makefile.unx
+++ b/samples/sockets/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -97,7 +97,7 @@ endif
all: test_for_selected_wxbuild client server baseclient baseserver
-install: all
+install:
uninstall:
diff --git a/samples/sockets/makefile.vc b/samples/sockets/makefile.vc
index 9e70a2c53b..cb954271f9 100644
--- a/samples/sockets/makefile.vc
+++ b/samples/sockets/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -83,18 +83,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -104,18 +104,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -374,25 +374,25 @@ clean:
!if "$(USE_GUI)" == "1"
$(OBJS)\client.exe: $(CLIENT_OBJECTS) $(OBJS)\client_client.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_3) /pdb:"$(OBJS)\client.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_3) /pdb:"$(OBJS)\client.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\server.exe: $(SERVER_OBJECTS) $(OBJS)\server_server.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_3) /pdb:"$(OBJS)\server.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_3) /pdb:"$(OBJS)\server.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
!endif
$(OBJS)\baseclient.exe: $(BASECLIENT_OBJECTS)
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_3) /pdb:"$(OBJS)\baseclient.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_3) /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
<<
$(OBJS)\baseserver.exe: $(BASESERVER_OBJECTS)
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_3) /pdb:"$(OBJS)\baseserver.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_3) /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
<<
diff --git a/samples/sockets/makefile.wat b/samples/sockets/makefile.wat
index fad95dc00e..c483d909fe 100644
--- a/samples/sockets/makefile.wat
+++ b/samples/sockets/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -293,7 +293,7 @@ $(OBJS)\client.exe : $(CLIENT_OBJECTS) $(OBJS)\client_client.res
@%append $(OBJS)\client.lbc option quiet
@%append $(OBJS)\client.lbc name $^@
@%append $(OBJS)\client.lbc option caseexact
- @%append $(OBJS)\client.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\client.lbc library %i
@%append $(OBJS)\client.lbc option resource=$(OBJS)\client_client.res
@@ -307,7 +307,7 @@ $(OBJS)\server.exe : $(SERVER_OBJECTS) $(OBJS)\server_server.res
@%append $(OBJS)\server.lbc option quiet
@%append $(OBJS)\server.lbc name $^@
@%append $(OBJS)\server.lbc option caseexact
- @%append $(OBJS)\server.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\server.lbc library %i
@%append $(OBJS)\server.lbc option resource=$(OBJS)\server_server.res
@@ -320,7 +320,7 @@ $(OBJS)\baseclient.exe : $(BASECLIENT_OBJECTS)
@%append $(OBJS)\baseclient.lbc option quiet
@%append $(OBJS)\baseclient.lbc name $^@
@%append $(OBJS)\baseclient.lbc option caseexact
- @%append $(OBJS)\baseclient.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt ref 'main_'
+ @%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) do @%append $(OBJS)\baseclient.lbc library %i
@%append $(OBJS)\baseclient.lbc
@@ -332,7 +332,7 @@ $(OBJS)\baseserver.exe : $(BASESERVER_OBJECTS)
@%append $(OBJS)\baseserver.lbc option quiet
@%append $(OBJS)\baseserver.lbc name $^@
@%append $(OBJS)\baseserver.lbc option caseexact
- @%append $(OBJS)\baseserver.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt ref 'main_'
+ @%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) do @%append $(OBJS)\baseserver.lbc library %i
@%append $(OBJS)\baseserver.lbc
diff --git a/samples/sockets/sockets_vc7_baseclient.vcproj b/samples/sockets/sockets_vc7_baseclient.vcproj
index 64ac8f1c39..97a91ada3a 100644
--- a/samples/sockets/sockets_vc7_baseclient.vcproj
+++ b/samples/sockets/sockets_vc7_baseclient.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\baseclient"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\baseclient\"
ObjectFile="vc_mswunivudll\baseclient\"
ProgramDataBaseFileName="vc_mswunivudll\baseclient.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\baseclient.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\baseclient.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\sockets_vc7_baseclient.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\baseclient"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\baseclient\"
ObjectFile="vc_mswunivuddll\baseclient\"
ProgramDataBaseFileName="vc_mswunivuddll\baseclient.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswunivuddll\baseclient.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\baseclient.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\sockets_vc7_baseclient.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\baseclient"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\baseclient\"
ObjectFile="vc_mswudll\baseclient\"
ProgramDataBaseFileName="vc_mswudll\baseclient.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\baseclient.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\baseclient.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\sockets_vc7_baseclient.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\baseclient"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\baseclient\"
ObjectFile="vc_mswuddll\baseclient\"
ProgramDataBaseFileName="vc_mswuddll\baseclient.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswuddll\baseclient.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\baseclient.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\sockets_vc7_baseclient.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\baseclient"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\baseclient\"
ObjectFile="vc_mswunivu\baseclient\"
ProgramDataBaseFileName="vc_mswunivu\baseclient.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\baseclient.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\baseclient.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\sockets_vc7_baseclient.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\baseclient"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\baseclient\"
ObjectFile="vc_mswunivud\baseclient\"
ProgramDataBaseFileName="vc_mswunivud\baseclient.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswunivud\baseclient.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\baseclient.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\sockets_vc7_baseclient.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\baseclient"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\baseclient\"
ObjectFile="vc_mswu\baseclient\"
ProgramDataBaseFileName="vc_mswu\baseclient.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\baseclient.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\baseclient.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\sockets_vc7_baseclient.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\baseclient"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\baseclient\"
ObjectFile="vc_mswud\baseclient\"
ProgramDataBaseFileName="vc_mswud\baseclient.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswud\baseclient.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\baseclient.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\sockets_vc7_baseclient.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,10 +523,11 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\baseclient.cpp"/>
+ RelativePath=".\baseclient.cpp">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/sockets/sockets_vc7_baseserver.vcproj b/samples/sockets/sockets_vc7_baseserver.vcproj
index ed58d240b3..783c04fe57 100644
--- a/samples/sockets/sockets_vc7_baseserver.vcproj
+++ b/samples/sockets/sockets_vc7_baseserver.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\baseserver"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\baseserver\"
ObjectFile="vc_mswunivudll\baseserver\"
ProgramDataBaseFileName="vc_mswunivudll\baseserver.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\baseserver.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\baseserver.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\sockets_vc7_baseserver.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\baseserver"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\baseserver\"
ObjectFile="vc_mswunivuddll\baseserver\"
ProgramDataBaseFileName="vc_mswunivuddll\baseserver.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswunivuddll\baseserver.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\baseserver.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\sockets_vc7_baseserver.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\baseserver"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\baseserver\"
ObjectFile="vc_mswudll\baseserver\"
ProgramDataBaseFileName="vc_mswudll\baseserver.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\baseserver.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\baseserver.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\sockets_vc7_baseserver.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\baseserver"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\baseserver\"
ObjectFile="vc_mswuddll\baseserver\"
ProgramDataBaseFileName="vc_mswuddll\baseserver.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswuddll\baseserver.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\baseserver.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\sockets_vc7_baseserver.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\baseserver"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\baseserver\"
ObjectFile="vc_mswunivu\baseserver\"
ProgramDataBaseFileName="vc_mswunivu\baseserver.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\baseserver.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\baseserver.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\sockets_vc7_baseserver.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\baseserver"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\baseserver\"
ObjectFile="vc_mswunivud\baseserver\"
ProgramDataBaseFileName="vc_mswunivud\baseserver.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswunivud\baseserver.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\baseserver.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\sockets_vc7_baseserver.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\baseserver"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\baseserver\"
ObjectFile="vc_mswu\baseserver\"
ProgramDataBaseFileName="vc_mswu\baseserver.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\baseserver.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\baseserver.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\sockets_vc7_baseserver.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\baseserver"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\baseserver\"
ObjectFile="vc_mswud\baseserver\"
ProgramDataBaseFileName="vc_mswud\baseserver.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswud\baseserver.exe"
LinkIncremental="2"
- SubSystem="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\baseserver.pdb"
+ SubSystem="1"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\sockets_vc7_baseserver.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,10 +523,11 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\baseserver.cpp"/>
+ RelativePath=".\baseserver.cpp">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/sockets/sockets_vc7_client.vcproj b/samples/sockets/sockets_vc7_client.vcproj
index 4a70537486..dd555d369e 100644
--- a/samples/sockets/sockets_vc7_client.vcproj
+++ b/samples/sockets/sockets_vc7_client.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\client"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\client\"
ObjectFile="vc_mswunivudll\client\"
ProgramDataBaseFileName="vc_mswunivudll\client.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\client.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\client.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\sockets_vc7_client.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\client"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\client\"
ObjectFile="vc_mswunivuddll\client\"
ProgramDataBaseFileName="vc_mswunivuddll\client.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswunivuddll\client.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\client.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\sockets_vc7_client.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\client"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\client\"
ObjectFile="vc_mswudll\client\"
ProgramDataBaseFileName="vc_mswudll\client.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\client.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\client.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\sockets_vc7_client.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\client"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\client\"
ObjectFile="vc_mswuddll\client\"
ProgramDataBaseFileName="vc_mswuddll\client.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswuddll\client.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\client.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\sockets_vc7_client.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\client"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\client\"
ObjectFile="vc_mswunivu\client\"
ProgramDataBaseFileName="vc_mswunivu\client.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\client.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\client.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\sockets_vc7_client.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\client"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\client\"
ObjectFile="vc_mswunivud\client\"
ProgramDataBaseFileName="vc_mswunivud\client.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswunivud\client.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\client.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\sockets_vc7_client.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\client"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\client\"
ObjectFile="vc_mswu\client\"
ProgramDataBaseFileName="vc_mswu\client.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\client.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\client.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\sockets_vc7_client.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\client"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\client\"
ObjectFile="vc_mswud\client\"
ProgramDataBaseFileName="vc_mswud\client.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswud\client.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\client.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\sockets_vc7_client.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\client.cpp"/>
+ RelativePath=".\client.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\client.rc"/>
+ RelativePath=".\client.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/sockets/sockets_vc7_server.vcproj b/samples/sockets/sockets_vc7_server.vcproj
index dbf999053b..5196155706 100644
--- a/samples/sockets/sockets_vc7_server.vcproj
+++ b/samples/sockets/sockets_vc7_server.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\server"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\server\"
ObjectFile="vc_mswunivudll\server\"
ProgramDataBaseFileName="vc_mswunivudll\server.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\server.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\server.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\sockets_vc7_server.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\server"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\server\"
ObjectFile="vc_mswunivuddll\server\"
ProgramDataBaseFileName="vc_mswunivuddll\server.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswunivuddll\server.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\server.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\sockets_vc7_server.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\server"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\server\"
ObjectFile="vc_mswudll\server\"
ProgramDataBaseFileName="vc_mswudll\server.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\server.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\server.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\sockets_vc7_server.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\server"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\server\"
ObjectFile="vc_mswuddll\server\"
ProgramDataBaseFileName="vc_mswuddll\server.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswuddll\server.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\server.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\sockets_vc7_server.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\server"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\server\"
ObjectFile="vc_mswunivu\server\"
ProgramDataBaseFileName="vc_mswunivu\server.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\server.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\server.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\sockets_vc7_server.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\server"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\server\"
ObjectFile="vc_mswunivud\server\"
ProgramDataBaseFileName="vc_mswunivud\server.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswunivud\server.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\server.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\sockets_vc7_server.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\server"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\server\"
ObjectFile="vc_mswu\server\"
ProgramDataBaseFileName="vc_mswu\server.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\server.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\server.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\sockets_vc7_server.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\server"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\server\"
ObjectFile="vc_mswud\server\"
ProgramDataBaseFileName="vc_mswud\server.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswud\server.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\server.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\sockets_vc7_server.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\server.cpp"/>
+ RelativePath=".\server.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\server.rc"/>
+ RelativePath=".\server.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/sockets/sockets_vc8_baseclient.vcproj b/samples/sockets/sockets_vc8_baseclient.vcproj
index 3ef00d3fcb..b4e2377181 100644
--- a/samples/sockets/sockets_vc8_baseclient.vcproj
+++ b/samples/sockets/sockets_vc8_baseclient.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\baseclient\"
ObjectFile="vc_mswunivudll\baseclient\"
ProgramDataBaseFileName="vc_mswunivudll\baseclient.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\baseclient.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\baseclient.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\baseclient\"
ObjectFile="vc_mswunivuddll\baseclient\"
ProgramDataBaseFileName="vc_mswunivuddll\baseclient.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswunivuddll\baseclient.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\baseclient.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\baseclient\"
ObjectFile="vc_mswudll\baseclient\"
ProgramDataBaseFileName="vc_mswudll\baseclient.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\baseclient.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\baseclient.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\baseclient\"
ObjectFile="vc_mswuddll\baseclient\"
ProgramDataBaseFileName="vc_mswuddll\baseclient.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswuddll\baseclient.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\baseclient.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\baseclient\"
ObjectFile="vc_mswunivu\baseclient\"
ProgramDataBaseFileName="vc_mswunivu\baseclient.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\baseclient.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\baseclient.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\baseclient\"
ObjectFile="vc_mswunivud\baseclient\"
ProgramDataBaseFileName="vc_mswunivud\baseclient.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswunivud\baseclient.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\baseclient.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\baseclient\"
ObjectFile="vc_mswu\baseclient\"
ProgramDataBaseFileName="vc_mswu\baseclient.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\baseclient.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\baseclient.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\baseclient\"
ObjectFile="vc_mswud\baseclient\"
ProgramDataBaseFileName="vc_mswud\baseclient.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswud\baseclient.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\baseclient.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,12 +784,13 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\baseclient.cpp"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/sockets/sockets_vc8_baseserver.vcproj b/samples/sockets/sockets_vc8_baseserver.vcproj
index ad49c610bf..fcdb0003ab 100644
--- a/samples/sockets/sockets_vc8_baseserver.vcproj
+++ b/samples/sockets/sockets_vc8_baseserver.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\baseserver\"
ObjectFile="vc_mswunivudll\baseserver\"
ProgramDataBaseFileName="vc_mswunivudll\baseserver.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\baseserver.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\baseserver.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\baseserver\"
ObjectFile="vc_mswunivuddll\baseserver\"
ProgramDataBaseFileName="vc_mswunivuddll\baseserver.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswunivuddll\baseserver.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\baseserver.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\baseserver\"
ObjectFile="vc_mswudll\baseserver\"
ProgramDataBaseFileName="vc_mswudll\baseserver.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\baseserver.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\baseserver.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\baseserver\"
ObjectFile="vc_mswuddll\baseserver\"
ProgramDataBaseFileName="vc_mswuddll\baseserver.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswuddll\baseserver.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\baseserver.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\baseserver\"
ObjectFile="vc_mswunivu\baseserver\"
ProgramDataBaseFileName="vc_mswunivu\baseserver.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\baseserver.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\baseserver.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\baseserver\"
ObjectFile="vc_mswunivud\baseserver\"
ProgramDataBaseFileName="vc_mswunivud\baseserver.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswunivud\baseserver.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\baseserver.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\baseserver\"
ObjectFile="vc_mswu\baseserver\"
ProgramDataBaseFileName="vc_mswu\baseserver.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\baseserver.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\baseserver.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\baseserver\"
ObjectFile="vc_mswud\baseserver\"
ProgramDataBaseFileName="vc_mswud\baseserver.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
AdditionalOptions=""
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.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"
OutputFile="vc_mswud\baseserver.exe"
LinkIncremental="2"
- SubSystem="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\baseserver.pdb"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,12 +784,13 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\baseserver.cpp"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/sockets/sockets_vc8_client.vcproj b/samples/sockets/sockets_vc8_client.vcproj
index 4b1e2510fd..89b95b519b 100644
--- a/samples/sockets/sockets_vc8_client.vcproj
+++ b/samples/sockets/sockets_vc8_client.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\client\"
ObjectFile="vc_mswunivudll\client\"
ProgramDataBaseFileName="vc_mswunivudll\client.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\client.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\client.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\client\"
ObjectFile="vc_mswunivuddll\client\"
ProgramDataBaseFileName="vc_mswunivuddll\client.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswunivuddll\client.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\client.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\client\"
ObjectFile="vc_mswudll\client\"
ProgramDataBaseFileName="vc_mswudll\client.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\client.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\client.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\client\"
ObjectFile="vc_mswuddll\client\"
ProgramDataBaseFileName="vc_mswuddll\client.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswuddll\client.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\client.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\client\"
ObjectFile="vc_mswunivu\client\"
ProgramDataBaseFileName="vc_mswunivu\client.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\client.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\client.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\client\"
ObjectFile="vc_mswunivud\client\"
ProgramDataBaseFileName="vc_mswunivud\client.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswunivud\client.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\client.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\client\"
ObjectFile="vc_mswu\client\"
ProgramDataBaseFileName="vc_mswu\client.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\client.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\client.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\client\"
ObjectFile="vc_mswud\client\"
ProgramDataBaseFileName="vc_mswud\client.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswud\client.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\client.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\client.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\client.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/sockets/sockets_vc8_server.vcproj b/samples/sockets/sockets_vc8_server.vcproj
index bf0e3ae7be..7b60f28063 100644
--- a/samples/sockets/sockets_vc8_server.vcproj
+++ b/samples/sockets/sockets_vc8_server.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\server\"
ObjectFile="vc_mswunivudll\server\"
ProgramDataBaseFileName="vc_mswunivudll\server.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\server.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\server.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\server\"
ObjectFile="vc_mswunivuddll\server\"
ProgramDataBaseFileName="vc_mswunivuddll\server.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswunivuddll\server.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\server.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\server\"
ObjectFile="vc_mswudll\server\"
ProgramDataBaseFileName="vc_mswudll\server.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\server.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\server.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\server\"
ObjectFile="vc_mswuddll\server\"
ProgramDataBaseFileName="vc_mswuddll\server.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswuddll\server.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\server.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\server\"
ObjectFile="vc_mswunivu\server\"
ProgramDataBaseFileName="vc_mswunivu\server.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\server.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\server.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\server\"
ObjectFile="vc_mswunivud\server\"
ProgramDataBaseFileName="vc_mswunivud\server.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswunivud\server.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\server.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\server\"
ObjectFile="vc_mswu\server\"
ProgramDataBaseFileName="vc_mswu\server.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\server.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\server.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\server\"
ObjectFile="vc_mswud\server\"
ProgramDataBaseFileName="vc_mswud\server.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_core.lib wxbase29ud_net.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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_core.lib wxbase29ud_net.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"
OutputFile="vc_mswud\server.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\server.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\server.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\server.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/sound/Makefile.in b/samples/sound/Makefile.in
index 686d219054..e8e4bb9a0e 100644
--- a/samples/sound/Makefile.in
+++ b/samples/sound/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -61,7 +61,7 @@ SOUND_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -115,28 +115,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: sound$(EXEEXT) $(__sound_bundle___depname) data
-install: all
+install:
uninstall:
@@ -152,7 +152,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
sound$(EXEEXT): $(SOUND_OBJECTS) $(__sound___win32rc)
- $(CXX) -o $@ $(SOUND_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
+ $(CXX) -o $@ $(SOUND_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
$(__sound___mac_setfilecmd)
$(__sound___os2_emxbindcmd)
@@ -209,6 +209,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean sound_bundle data
diff --git a/samples/sound/makefile.bcc b/samples/sound/makefile.bcc
index ee48f5ed9e..f31e512139 100644
--- a/samples/sound/makefile.bcc
+++ b/samples/sound/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -233,7 +233,7 @@ clean:
-if exist $(OBJS)\sound.ils del $(OBJS)\sound.ils
$(OBJS)\sound.exe: $(SOUND_OBJECTS) $(OBJS)\sound_sound.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/sound/makefile.gcc b/samples/sound/makefile.gcc
index 5c5119e456..52acbf81b6 100644
--- a/samples/sound/makefile.gcc
+++ b/samples/sound/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -228,7 +228,7 @@ clean:
-if exist $(OBJS)\sound.exe del $(OBJS)\sound.exe
$(OBJS)\sound.exe: $(SOUND_OBJECTS) $(OBJS)\sound_sound_rc.o
- $(CXX) -o $@ $(SOUND_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
data:
if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/sound/makefile.unx b/samples/sound/makefile.unx
index 9973674bb2..fdc8c3a38c 100644
--- a/samples/sound/makefile.unx
+++ b/samples/sound/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild sound
-install: all
+install:
uninstall:
diff --git a/samples/sound/makefile.vc b/samples/sound/makefile.vc
index e2fa52c7cd..969a101f45 100644
--- a/samples/sound/makefile.vc
+++ b/samples/sound/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -309,7 +309,7 @@ clean:
-if exist $(OBJS)\sound.pdb del $(OBJS)\sound.pdb
$(OBJS)\sound.exe: $(SOUND_OBJECTS) $(OBJS)\sound_sound.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\sound.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\sound.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/sound/makefile.wat b/samples/sound/makefile.wat
index 3c78104355..e2a12f613a 100644
--- a/samples/sound/makefile.wat
+++ b/samples/sound/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -256,7 +256,7 @@ $(OBJS)\sound.exe : $(SOUND_OBJECTS) $(OBJS)\sound_sound.res
@%append $(OBJS)\sound.lbc option quiet
@%append $(OBJS)\sound.lbc name $^@
@%append $(OBJS)\sound.lbc option caseexact
- @%append $(OBJS)\sound.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\sound.lbc library %i
@%append $(OBJS)\sound.lbc option resource=$(OBJS)\sound_sound.res
diff --git a/samples/sound/sound_vc7.vcproj b/samples/sound/sound_vc7.vcproj
index 6798f36c92..aeec110b85 100644
--- a/samples/sound/sound_vc7.vcproj
+++ b/samples/sound/sound_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\sound"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\sound\"
ObjectFile="vc_mswunivudll\sound\"
ProgramDataBaseFileName="vc_mswunivudll\sound.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\sound.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\sound.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\sound_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\sound"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\sound\"
ObjectFile="vc_mswunivuddll\sound\"
ProgramDataBaseFileName="vc_mswunivuddll\sound.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivuddll\sound.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\sound.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\sound_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\sound"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\sound\"
ObjectFile="vc_mswudll\sound\"
ProgramDataBaseFileName="vc_mswudll\sound.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\sound.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\sound.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\sound_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\sound"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\sound\"
ObjectFile="vc_mswuddll\sound\"
ProgramDataBaseFileName="vc_mswuddll\sound.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswuddll\sound.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\sound.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\sound_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\sound"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\sound\"
ObjectFile="vc_mswunivu\sound\"
ProgramDataBaseFileName="vc_mswunivu\sound.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\sound.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\sound.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\sound_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\sound"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\sound\"
ObjectFile="vc_mswunivud\sound\"
ProgramDataBaseFileName="vc_mswunivud\sound.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivud\sound.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\sound.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\sound_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\sound"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\sound\"
ObjectFile="vc_mswu\sound\"
ProgramDataBaseFileName="vc_mswu\sound.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\sound.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\sound.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\sound_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\sound"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\sound\"
ObjectFile="vc_mswud\sound\"
ProgramDataBaseFileName="vc_mswud\sound.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswud\sound.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\sound.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\sound_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\sound.cpp"/>
+ RelativePath=".\sound.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\sound.rc"/>
+ RelativePath=".\sound.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/sound/sound_vc8.vcproj b/samples/sound/sound_vc8.vcproj
index 699b7de5b2..dbcaf6e04f 100644
--- a/samples/sound/sound_vc8.vcproj
+++ b/samples/sound/sound_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\sound\"
ObjectFile="vc_mswunivudll\sound\"
ProgramDataBaseFileName="vc_mswunivudll\sound.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\sound.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\sound.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\sound\"
ObjectFile="vc_mswunivuddll\sound\"
ProgramDataBaseFileName="vc_mswunivuddll\sound.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivuddll\sound.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\sound.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\sound\"
ObjectFile="vc_mswudll\sound\"
ProgramDataBaseFileName="vc_mswudll\sound.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\sound.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\sound.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\sound\"
ObjectFile="vc_mswuddll\sound\"
ProgramDataBaseFileName="vc_mswuddll\sound.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswuddll\sound.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\sound.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\sound\"
ObjectFile="vc_mswunivu\sound\"
ProgramDataBaseFileName="vc_mswunivu\sound.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\sound.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\sound.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\sound\"
ObjectFile="vc_mswunivud\sound\"
ProgramDataBaseFileName="vc_mswunivud\sound.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivud\sound.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\sound.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\sound\"
ObjectFile="vc_mswu\sound\"
ProgramDataBaseFileName="vc_mswu\sound.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\sound.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\sound.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\sound\"
ObjectFile="vc_mswud\sound\"
ProgramDataBaseFileName="vc_mswud\sound.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_adv.lib 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"
OutputFile="vc_mswud\sound.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\sound.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\sound.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\sound.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/splash/Makefile.in b/samples/splash/Makefile.in
index 19d885688b..3af5739f42 100644
--- a/samples/splash/Makefile.in
+++ b/samples/splash/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -62,7 +62,7 @@ SPLASH_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -119,28 +119,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: splash$(EXEEXT) $(__splash_bundle___depname) data
-install: all
+install:
uninstall:
@@ -156,7 +156,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
splash$(EXEEXT): $(SPLASH_OBJECTS) $(__splash___win32rc)
- $(CXX) -o $@ $(SPLASH_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
+ $(CXX) -o $@ $(SPLASH_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
$(__splash___mac_setfilecmd)
$(__splash___os2_emxbindcmd)
@@ -213,6 +213,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean splash_bundle data
diff --git a/samples/splash/makefile.bcc b/samples/splash/makefile.bcc
index 441c6d138f..4c82532774 100644
--- a/samples/splash/makefile.bcc
+++ b/samples/splash/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -237,7 +237,7 @@ clean:
-if exist $(OBJS)\splash.ils del $(OBJS)\splash.ils
$(OBJS)\splash.exe: $(SPLASH_OBJECTS) $(OBJS)\splash_sample.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/splash/makefile.gcc b/samples/splash/makefile.gcc
index e46da06093..e9be64ea3b 100644
--- a/samples/splash/makefile.gcc
+++ b/samples/splash/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -234,7 +234,7 @@ clean:
-if exist $(OBJS)\splash.exe del $(OBJS)\splash.exe
$(OBJS)\splash.exe: $(SPLASH_OBJECTS) $(OBJS)\splash_sample_rc.o
- $(CXX) -o $@ $(SPLASH_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
data:
if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/splash/makefile.unx b/samples/splash/makefile.unx
index c411531050..447a95920f 100644
--- a/samples/splash/makefile.unx
+++ b/samples/splash/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild splash
-install: all
+install:
uninstall:
diff --git a/samples/splash/makefile.vc b/samples/splash/makefile.vc
index 23735c8a8d..e641101b84 100644
--- a/samples/splash/makefile.vc
+++ b/samples/splash/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -313,7 +313,7 @@ clean:
-if exist $(OBJS)\splash.pdb del $(OBJS)\splash.pdb
$(OBJS)\splash.exe: $(SPLASH_OBJECTS) $(OBJS)\splash_sample.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\splash.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\splash.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/splash/makefile.wat b/samples/splash/makefile.wat
index d843642ad2..64bf39d711 100644
--- a/samples/splash/makefile.wat
+++ b/samples/splash/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -263,7 +263,7 @@ $(OBJS)\splash.exe : $(SPLASH_OBJECTS) $(OBJS)\splash_sample.res
@%append $(OBJS)\splash.lbc option quiet
@%append $(OBJS)\splash.lbc name $^@
@%append $(OBJS)\splash.lbc option caseexact
- @%append $(OBJS)\splash.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\splash.lbc library %i
@%append $(OBJS)\splash.lbc option resource=$(OBJS)\splash_sample.res
diff --git a/samples/splash/splash_vc7.vcproj b/samples/splash/splash_vc7.vcproj
index b77cb7a8a1..fd994d609f 100644
--- a/samples/splash/splash_vc7.vcproj
+++ b/samples/splash/splash_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\splash"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\splash\"
ObjectFile="vc_mswunivudll\splash\"
ProgramDataBaseFileName="vc_mswunivudll\splash.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\splash.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\splash.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\splash_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\splash"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\splash\"
ObjectFile="vc_mswunivuddll\splash\"
ProgramDataBaseFileName="vc_mswunivuddll\splash.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_media.lib wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_media.lib wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivuddll\splash.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\splash.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\splash_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\splash"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\splash\"
ObjectFile="vc_mswudll\splash\"
ProgramDataBaseFileName="vc_mswudll\splash.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\splash.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\splash.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\splash_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\splash"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\splash\"
ObjectFile="vc_mswuddll\splash\"
ProgramDataBaseFileName="vc_mswuddll\splash.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_media.lib wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_media.lib wxmsw29ud_adv.lib 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"
OutputFile="vc_mswuddll\splash.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\splash.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\splash_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\splash"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\splash\"
ObjectFile="vc_mswunivu\splash\"
ProgramDataBaseFileName="vc_mswunivu\splash.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\splash.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\splash.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\splash_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\splash"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\splash\"
ObjectFile="vc_mswunivud\splash\"
ProgramDataBaseFileName="vc_mswunivud\splash.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_media.lib wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_media.lib wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivud\splash.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\splash.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\splash_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\splash"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\splash\"
ObjectFile="vc_mswu\splash\"
ProgramDataBaseFileName="vc_mswu\splash.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\splash.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\splash.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\splash_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\splash"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\splash\"
ObjectFile="vc_mswud\splash\"
ProgramDataBaseFileName="vc_mswud\splash.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_media.lib wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_media.lib wxmsw29ud_adv.lib 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"
OutputFile="vc_mswud\splash.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\splash.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\splash_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\splash.cpp"/>
+ RelativePath=".\splash.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\..\sample.rc"/>
+ RelativePath=".\..\sample.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/splash/splash_vc8.vcproj b/samples/splash/splash_vc8.vcproj
index 8c31c7f433..5e07f00897 100644
--- a/samples/splash/splash_vc8.vcproj
+++ b/samples/splash/splash_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\splash\"
ObjectFile="vc_mswunivudll\splash\"
ProgramDataBaseFileName="vc_mswunivudll\splash.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivudll\splash.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\splash.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\splash\"
ObjectFile="vc_mswunivuddll\splash\"
ProgramDataBaseFileName="vc_mswunivuddll\splash.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_media.lib wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_media.lib wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivuddll\splash.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\splash.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\splash\"
ObjectFile="vc_mswudll\splash\"
ProgramDataBaseFileName="vc_mswudll\splash.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswudll\splash.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\splash.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\splash\"
ObjectFile="vc_mswuddll\splash\"
ProgramDataBaseFileName="vc_mswuddll\splash.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_media.lib wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_media.lib wxmsw29ud_adv.lib 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"
OutputFile="vc_mswuddll\splash.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\splash.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\splash\"
ObjectFile="vc_mswunivu\splash\"
ProgramDataBaseFileName="vc_mswunivu\splash.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswunivu\splash.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\splash.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\splash\"
ObjectFile="vc_mswunivud\splash\"
ProgramDataBaseFileName="vc_mswunivud\splash.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29ud_media.lib wxmswuniv29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmswuniv29ud_media.lib wxmswuniv29ud_adv.lib 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"
OutputFile="vc_mswunivud\splash.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\splash.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\splash\"
ObjectFile="vc_mswu\splash\"
ProgramDataBaseFileName="vc_mswu\splash.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
AdditionalOptions=""
+ 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"
OutputFile="vc_mswu\splash.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\splash.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\splash\"
ObjectFile="vc_mswud\splash\"
ProgramDataBaseFileName="vc_mswud\splash.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29ud_media.lib wxmsw29ud_adv.lib 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"
AdditionalOptions=""
+ AdditionalDependencies="wxmsw29ud_media.lib wxmsw29ud_adv.lib 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"
OutputFile="vc_mswud\splash.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\splash.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\splash.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\..\sample.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in
index 728229f7a6..e6a9190890 100644
--- a/samples/splitter/Makefile.in
+++ b/samples/splitter/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ SPLITTER_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: splitter$(EXEEXT) $(__splitter_bundle___depname)
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
splitter$(EXEEXT): $(SPLITTER_OBJECTS) $(__splitter___win32rc)
- $(CXX) -o $@ $(SPLITTER_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(SPLITTER_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)
$(__splitter___mac_setfilecmd)
$(__splitter___os2_emxbindcmd)
@@ -192,6 +192,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean splitter_bundle
diff --git a/samples/splitter/makefile.bcc b/samples/splitter/makefile.bcc
index c5255f4319..b2d0966d76 100644
--- a/samples/splitter/makefile.bcc
+++ b/samples/splitter/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\splitter.ils del $(OBJS)\splitter.ils
$(OBJS)\splitter.exe: $(SPLITTER_OBJECTS) $(OBJS)\splitter_splitter.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/splitter/makefile.gcc b/samples/splitter/makefile.gcc
index 5d5c19a112..97339c82c4 100644
--- a/samples/splitter/makefile.gcc
+++ b/samples/splitter/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\splitter.exe del $(OBJS)\splitter.exe
$(OBJS)\splitter.exe: $(SPLITTER_OBJECTS) $(OBJS)\splitter_splitter_rc.o
- $(CXX) -o $@ $(SPLITTER_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(OBJS)\splitter_splitter.o: ./splitter.cpp
$(CXX) -c -o $@ $(SPLITTER_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/splitter/makefile.unx b/samples/splitter/makefile.unx
index 0198c96c56..a6a0d81ecd 100644
--- a/samples/splitter/makefile.unx
+++ b/samples/splitter/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild splitter
-install: all
+install:
uninstall:
diff --git a/samples/splitter/makefile.vc b/samples/splitter/makefile.vc
index 4fa949c51c..4cb31c1911 100644
--- a/samples/splitter/makefile.vc
+++ b/samples/splitter/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\splitter.pdb del $(OBJS)\splitter.pdb
$(OBJS)\splitter.exe: $(SPLITTER_OBJECTS) $(OBJS)\splitter_splitter.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\splitter.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\splitter.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/splitter/makefile.wat b/samples/splitter/makefile.wat
index 326da88654..bcdbd8554a 100644
--- a/samples/splitter/makefile.wat
+++ b/samples/splitter/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\splitter.exe : $(SPLITTER_OBJECTS) $(OBJS)\splitter_splitter.res
@%append $(OBJS)\splitter.lbc option quiet
@%append $(OBJS)\splitter.lbc name $^@
@%append $(OBJS)\splitter.lbc option caseexact
- @%append $(OBJS)\splitter.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\splitter.lbc library %i
@%append $(OBJS)\splitter.lbc option resource=$(OBJS)\splitter_splitter.res
diff --git a/samples/splitter/splitter_vc7.vcproj b/samples/splitter/splitter_vc7.vcproj
index 338b2b7077..a5fd3664e4 100644
--- a/samples/splitter/splitter_vc7.vcproj
+++ b/samples/splitter/splitter_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\splitter"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\splitter\"
ObjectFile="vc_mswunivudll\splitter\"
ProgramDataBaseFileName="vc_mswunivudll\splitter.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\splitter.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\splitter.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\splitter_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\splitter"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\splitter\"
ObjectFile="vc_mswunivuddll\splitter\"
ProgramDataBaseFileName="vc_mswunivuddll\splitter.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\splitter.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\splitter.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\splitter_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\splitter"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\splitter\"
ObjectFile="vc_mswudll\splitter\"
ProgramDataBaseFileName="vc_mswudll\splitter.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\splitter.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\splitter.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\splitter_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\splitter"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\splitter\"
ObjectFile="vc_mswuddll\splitter\"
ProgramDataBaseFileName="vc_mswuddll\splitter.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\splitter.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\splitter.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\splitter_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\splitter"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\splitter\"
ObjectFile="vc_mswunivu\splitter\"
ProgramDataBaseFileName="vc_mswunivu\splitter.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\splitter.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\splitter.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivu\splitter_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
@@ -397,74 +333,63 @@
IntermediateDirectory="vc_mswunivud\splitter"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\splitter\"
ObjectFile="vc_mswunivud\splitter\"
ProgramDataBaseFileName="vc_mswunivud\splitter.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\splitter.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\splitter.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivud\splitter_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -472,74 +397,60 @@
IntermediateDirectory="vc_mswu\splitter"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\splitter\"
ObjectFile="vc_mswu\splitter\"
ProgramDataBaseFileName="vc_mswu\splitter.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\splitter.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\splitter.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswu\splitter_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -547,74 +458,63 @@
IntermediateDirectory="vc_mswud\splitter"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\splitter\"
ObjectFile="vc_mswud\splitter\"
ProgramDataBaseFileName="vc_mswud\splitter.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\splitter.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\splitter.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswud\splitter_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -623,17 +523,19 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\splitter.cpp"/>
+ RelativePath=".\splitter.cpp">
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+ 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=".\splitter.rc"/>
+ RelativePath=".\splitter.rc">
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/splitter/splitter_vc8.vcproj b/samples/splitter/splitter_vc8.vcproj
index 775836cd29..4eaedd553a 100644
--- a/samples/splitter/splitter_vc8.vcproj
+++ b/samples/splitter/splitter_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,57 +43,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivudll\splitter\"
ObjectFile="vc_mswunivudll\splitter\"
ProgramDataBaseFileName="vc_mswunivudll\splitter.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\splitter.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\splitter.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -137,57 +136,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivuddll\splitter\"
ObjectFile="vc_mswunivuddll\splitter\"
ProgramDataBaseFileName="vc_mswunivuddll\splitter.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\splitter.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivuddll\splitter.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -231,57 +232,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswudll\splitter\"
ObjectFile="vc_mswudll\splitter\"
ProgramDataBaseFileName="vc_mswudll\splitter.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\splitter.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\splitter.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -325,57 +325,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswuddll\splitter\"
ObjectFile="vc_mswuddll\splitter\"
ProgramDataBaseFileName="vc_mswuddll\splitter.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\splitter.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\splitter.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -419,57 +421,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivu\splitter\"
ObjectFile="vc_mswunivu\splitter\"
ProgramDataBaseFileName="vc_mswunivu\splitter.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"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\splitter.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\splitter.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -513,57 +514,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswunivud\splitter\"
ObjectFile="vc_mswunivud\splitter\"
ProgramDataBaseFileName="vc_mswunivud\splitter.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivud\splitter.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivud\splitter.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -607,57 +610,56 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="1"
- AdditionalOptions=""
RuntimeLibrary="2"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswu\splitter\"
ObjectFile="vc_mswu\splitter\"
ProgramDataBaseFileName="vc_mswu\splitter.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"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswu\splitter.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\splitter.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -701,57 +703,59 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
+ Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="true"
ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
RuntimeTypeInfo="true"
AssemblerListingLocation="vc_mswud\splitter\"
ObjectFile="vc_mswud\splitter\"
ProgramDataBaseFileName="vc_mswud\splitter.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswud\splitter.exe"
LinkIncremental="2"
- SubSystem="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\splitter.pdb"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -780,21 +784,23 @@
<Files>
<Filter
Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\splitter.cpp"
- />
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
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=".\splitter.rc"
- />
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/samples/statbar/Makefile.in b/samples/statbar/Makefile.in
index 1544b5afdc..51ce6385aa 100644
--- a/samples/statbar/Makefile.in
+++ b/samples/statbar/Makefile.in
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -59,7 +59,7 @@ STATBAR_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
### Targets: ###
all: statbar$(EXEEXT) $(__statbar_bundle___depname)
-install: all
+install:
uninstall:
@@ -147,7 +147,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
statbar$(EXEEXT): $(STATBAR_OBJECTS) $(__statbar___win32rc)
- $(CXX) -o $@ $(STATBAR_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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)
+ $(CXX) -o $@ $(STATBAR_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)
$(__statbar___mac_setfilecmd)
$(__statbar___os2_emxbindcmd)
@@ -192,6 +192,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean statbar_bundle
diff --git a/samples/statbar/makefile.bcc b/samples/statbar/makefile.bcc
index a0661b8ca5..7d6715eea1 100644
--- a/samples/statbar/makefile.bcc
+++ b/samples/statbar/makefile.bcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -229,7 +229,7 @@ clean:
-if exist $(OBJS)\statbar.ils del $(OBJS)\statbar.ils
$(OBJS)\statbar.exe: $(STATBAR_OBJECTS) $(OBJS)\statbar_statbar.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ 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
|
diff --git a/samples/statbar/makefile.gcc b/samples/statbar/makefile.gcc
index 6951cba916..91ec361f03 100644
--- a/samples/statbar/makefile.gcc
+++ b/samples/statbar/makefile.gcc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
### Variables: ###
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc
OBJS = \
@@ -224,7 +224,7 @@ clean:
-if exist $(OBJS)\statbar.exe del $(OBJS)\statbar.exe
$(OBJS)\statbar.exe: $(STATBAR_OBJECTS) $(OBJS)\statbar_statbar_rc.o
- $(CXX) -o $@ $(STATBAR_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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
+ $(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
$(OBJS)\statbar_statbar.o: ./statbar.cpp
$(CXX) -c -o $@ $(STATBAR_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/statbar/makefile.unx b/samples/statbar/makefile.unx
index 97eed44e73..b2a58a6faf 100644
--- a/samples/statbar/makefile.unx
+++ b/samples/statbar/makefile.unx
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,34 +11,34 @@
# -------------------------------------------------------------------------
# C++ compiler
-CXX := g++
+CXX ?= g++
# Standard flags for C++
-CXXFLAGS :=
+CXXFLAGS ?=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS ?=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS ?=
# Location and arguments of wx-config script
-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
# Version of the wx library to build against.
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
@@ -85,7 +85,7 @@ endif
all: test_for_selected_wxbuild statbar
-install: all
+install:
uninstall:
diff --git a/samples/statbar/makefile.vc b/samples/statbar/makefile.vc
index 50112f97c9..9e0a0708f6 100644
--- a/samples/statbar/makefile.vc
+++ b/samples/statbar/makefile.vc
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll
!endif
-!if "$(TARGET_CPU)" == "amd64"
+!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 "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -305,7 +305,7 @@ clean:
-if exist $(OBJS)\statbar.pdb del $(OBJS)\statbar.pdb
$(OBJS)\statbar.exe: $(STATBAR_OBJECTS) $(OBJS)\statbar_statbar.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\statbar.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\statbar.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
$(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
<<
diff --git a/samples/statbar/makefile.wat b/samples/statbar/makefile.wat
index 32881c6208..1cc87279f7 100644
--- a/samples/statbar/makefile.wat
+++ b/samples/statbar/makefile.wat
@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.3 (http://www.bakefile.org)
+# Bakefile 0.2.4 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -251,7 +251,7 @@ $(OBJS)\statbar.exe : $(STATBAR_OBJECTS) $(OBJS)\statbar_statbar.res
@%append $(OBJS)\statbar.lbc option quiet
@%append $(OBJS)\statbar.lbc name $^@
@%append $(OBJS)\statbar.lbc option caseexact
- @%append $(OBJS)\statbar.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @%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) do @%append $(OBJS)\statbar.lbc library %i
@%append $(OBJS)\statbar.lbc option resource=$(OBJS)\statbar_statbar.res
diff --git a/samples/statbar/statbar_vc7.vcproj b/samples/statbar/statbar_vc7.vcproj
index 24bc0a6949..b543e356d3 100644
--- a/samples/statbar/statbar_vc7.vcproj
+++ b/samples/statbar/statbar_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
- Bakefile 0.2.3 (http://www.bakefile.org)
+ Bakefile 0.2.4 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -22,74 +22,60 @@
IntermediateDirectory="vc_mswunivudll\statbar"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\statbar\"
ObjectFile="vc_mswunivudll\statbar\"
ProgramDataBaseFileName="vc_mswunivudll\statbar.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivudll\statbar.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\statbar.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivudll\statbar_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
@@ -97,74 +83,63 @@
IntermediateDirectory="vc_mswunivuddll\statbar"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\statbar\"
ObjectFile="vc_mswunivuddll\statbar\"
ProgramDataBaseFileName="vc_mswunivuddll\statbar.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswunivuddll\statbar.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\statbar.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswunivuddll\statbar_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
@@ -172,74 +147,60 @@
IntermediateDirectory="vc_mswudll\statbar"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\statbar\"
ObjectFile="vc_mswudll\statbar\"
ProgramDataBaseFileName="vc_mswudll\statbar.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswudll\statbar.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\statbar.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswudll\statbar_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
@@ -247,74 +208,63 @@
IntermediateDirectory="vc_mswuddll\statbar"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="true"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="3"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\statbar\"
ObjectFile="vc_mswuddll\statbar\"
ProgramDataBaseFileName="vc_mswuddll\statbar.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- 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"
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"
OutputFile="vc_mswuddll\statbar.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\statbar.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<Tool
- Name="VCALinkTool"/>
+ Name="VCMIDLTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- OutputFile="vc_mswuddll\statbar_vc7.bsc"
- SuppressStartupBanner="true"/>
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
@@ -322,74 +272,60 @@
IntermediateDirectory="vc_mswunivu\statbar"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCIDLTool"/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- MinimalRebuild="false"
- ExceptionHandling="1"
- AdditionalOptions=""
- RuntimeLibrary="2"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- Detect64BitPortabilityProblems="true"
- RuntimeTypeInfo="true"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\statbar\"
ObjectFile="vc_mswunivu\statbar\"
ProgramDataBaseFileName="vc_mswunivu\statbar.pdb"
WarningLevel="4"
- SuppressStartupBanner="true"/>
- <Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
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"
OutputFile="vc_mswunivu\statbar.exe"
LinkIncremental="2"
- SubSystem="2"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\statbar.pdb"
+ SubSystem="2"
TargetMachine="1"/>
<